diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index c07cebd0..b7a792a1 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -1275,6 +1275,10 @@ class AareDAQ:
         Returns:
             CompletedRasterGrid result or None if failed
         """
+        if self.sample is None:
+            raise RasterScanException(
+                "Please load a sample before running a raster scan. If you have manually mounted a sample, create its record in the 'Manual sample' panel."
+            )
         try:
             logger.info(
                 "Starting raster sequence",
@@ -2037,7 +2041,7 @@ class AareDAQ:
             result = self._execute_raster_sequence(request, auto_center=auto_center)
 
             if result is None:
-                raise RasterScanException("Raster scan failed")
+                raise RasterScanException("Raster scan failed for unknown reason.")
             self._set_state(BeamlineStateEnum.SampleAlignment)
             return result
         except Exception:
diff --git a/src/aare/daq/operations/raster/service.py b/src/aare/daq/operations/raster/service.py
index 31129448..62ebba26 100644
--- a/src/aare/daq/operations/raster/service.py
+++ b/src/aare/daq/operations/raster/service.py
@@ -521,8 +521,11 @@ class RasterService:
                 )
                 raise RasterScanException("JFJoch returned no ScanResult for raster")
             else:
-                self.logger.info(
-                    f"Raster scan results from JFJoch: file {scan_result.file_prefix} with images {scan_result.images}"
+                truncated_images = (
+                    scan_result.images[:3] if len(scan_result.images) > 3 else scan_result.images
+                )
+                self.logger.debug(
+                    f"Raster scan results from JFJoch: file {scan_result.file_prefix} with images {truncated_images} ..."
                 )
             analysis_results = self._get_anaylsis_results(
                 self.ctx.deps.cfg.gridscan_analysis_mode, scan_result, request, daq=self.ctx.status