diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index c3c28f9..41fd50c 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -240,7 +240,11 @@ public class Controller {
             setPuckLoading(false);
             Logger.getLogger(Controller.class.getName()).log(Level.WARNING, null, ex);
         }
-        refreshSamplesTable();
+        try {
+            refreshSamplesTable();
+        } catch (Exception ex) {
+            Logger.getLogger(Controller.class.getName()).log(Level.WARNING, null, ex);
+        }
     }
 
     final DeviceListener hexiposiListener = new DeviceAdapter() {
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index a8d850a..c6f0fa0 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -10,6 +10,7 @@ import ch.psi.pshell.device.DeviceAdapter;
 import ch.psi.pshell.imaging.Renderer;
 import ch.psi.pshell.imaging.RendererMode;
 import ch.psi.pshell.imaging.Source;
+import ch.psi.pshell.scripting.ViewPreference;
 import ch.psi.pshell.ui.App;
 import ch.psi.pshell.ui.Panel;
 import ch.psi.utils.State;
@@ -241,11 +242,9 @@ public class MainPanel extends Panel {
             Controller.getInstance().onTimer();
             if (getState() == State.Ready) {
                 if (Boolean.TRUE.equals(Controller.getInstance().isPuckLoading())) {
-                    getView().getStatusBar().setStatusMessage(PUCK_LOADING_STATUS);
-                } else {
-                    if (PUCK_LOADING_STATUS.equals(getView().getStatusBar().getStatusLabel().getText())) {
-                        getView().getStatusBar().setApplicationState(getState());
-                    }
+                    getContext().setPreference(ViewPreference.STATUS, PUCK_LOADING_STATUS);                    
+                } else {                    
+                    getContext().setPreference(ViewPreference.STATUS, "Ready");
                 }
             }
         } catch (Exception ex) {