diff --git a/MAC/Services/TBB/TBBServer/lib/tbbservice.py b/MAC/Services/TBB/TBBServer/lib/tbbservice.py
index 37bf908499cba3e33df74b45f33d3468c5967b33..b9b923a8e39c43f7bd287a7d50a64272aef063be 100644
--- a/MAC/Services/TBB/TBBServer/lib/tbbservice.py
+++ b/MAC/Services/TBB/TBBServer/lib/tbbservice.py
@@ -533,9 +533,15 @@ class TBBControlService:
             logger.exception('Could not create storage map. Will try to dump anyway.')
 
         # start upload
-        self.upload_data(lcus_str, dm, starttime, duration, subbands, waittime, boards)
+        try:
+            self.upload_data(lcus_str, dm, starttime, duration, subbands, waittime, boards)
+        except:
+            logger.exception('Error while uploading tbb data to cep.')
 
-        self._add_meta_data_to_h5_files(output_path)
+        try:
+            self._add_meta_data_to_h5_files(output_path)
+        except:
+            logger.exception('Error adding meta-data to h5 files in %s.' % (output_path,))
 
         # restart recording
         self.restart_recording(lcus_str)