diff --git a/bin/psss_panel b/bin/psss_panel
index 008fafe..61e89f6 100755
--- a/bin/psss_panel
+++ b/bin/psss_panel
@@ -1,10 +1,26 @@
 #!/bin/bash
 
+MY_PATH=$(dirname "$0")
+export PKG=${MY_PATH}/..
+
+#Check if running as e-account
+for i in "$@"
+do
+case $i in
+
+    -pkg=*)
+        export PKG="${i#*=}"
+    ;;
+
+    *)    # unknown option            
+    ;;
+esac
+done
 
 /opt/gfa/pshell/pshell \
 	-version=v1_17 \
 	-py3 \
-	-m=/opt/gfa/pshell/apps/psss_panel \
+	-m=${PKG} \
 	-z \
 	-nbcf=true \
 	-laf=dark \
diff --git a/bin/psss_panel_editor b/bin/psss_panel_editor
index 0d6ce67..7995352 100755
--- a/bin/psss_panel_editor
+++ b/bin/psss_panel_editor
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+MY_PATH=$(dirname "$0")
+export PKG=${MY_PATH}/..
+
+#Check if running as e-account
+for i in "$@"
+do
+case $i in
+
+    -pkg=*)
+        export PKG="${i#*=}"
+    ;;
+
+    *)    # unknown option            
+    ;;
+esac
+done
+
 
 /opt/gfa/pshell/pshell \
 	-py3 \
@@ -8,6 +25,6 @@
 	-nbcf=true \
 	-laf=dark \
 	-pini=true \
-        -setp=/opt/gfa/pshell/apps/psss_panel/config/setup.properties \
+        -setp=${PKG}/config/setup.properties \
         -p=PSSS.java \
         $@ 
diff --git a/plugins/PSSS.java b/plugins/PSSS.java
index df4c4ba..e652bf2 100755
--- a/plugins/PSSS.java
+++ b/plugins/PSSS.java
@@ -59,7 +59,7 @@ public class PSSS extends Panel {
                 spFromEn.setValue(energy-150);
                 spToEn.setValue(energy+150);
             } catch (Exception ex) {
-                getLogger().log(Level.WARNING, null, ex);
+                getLogger().warning("Error reading energy_machine");
             }