diff --git a/config/settings.properties b/config/settings.properties
index 160ca8e..69f5cc1 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,15 +1,16 @@
-#Tue Nov 02 14:37:59 CET 2021
+#Wed Dec 01 14:00:32 CET 2021
 dry_mount_counter=0
+mounted_sample_position=X11
 room_temperature_enabled=false
 pin_offset=-0.0
 puck_types=true
 pin_cleaner_timer=60
 imaging_enabled=false
-dry_timestamp=1.635805626208E9
+dry_timestamp=1.638363632386E9
 roi_h=1000
 led_level=0.0
 beamline_status_enabled=false
-force_dry_mount_count=12
+force_dry_mount_count=1
 roi_y=123
 barcode_reader_scan_pucks=false
 cold_position_timeout=3600
diff --git a/devices/B3.properties b/devices/B3.properties
index 31bcbbc..489bfe6 100644
--- a/devices/B3.properties
+++ b/devices/B3.properties
@@ -1,3 +1,3 @@
-#Tue Sep 01 14:03:17 CEST 2020
+#Tue Nov 30 15:12:06 CET 2021
 detection=Mechanical
 disabled=false
diff --git a/devices/C2.properties b/devices/C2.properties
index fe76b05..d3900f5 100644
--- a/devices/C2.properties
+++ b/devices/C2.properties
@@ -1,3 +1,3 @@
-#Wed Oct 27 08:12:59 CEST 2021
+#Fri Nov 12 07:44:56 CET 2021
 detection=Mechanical
 disabled=false
diff --git a/devices/D2.properties b/devices/D2.properties
index 3e0c7a5..43be350 100644
--- a/devices/D2.properties
+++ b/devices/D2.properties
@@ -1,3 +1,3 @@
-#Tue Sep 08 09:28:59 CEST 2020
+#Tue Nov 30 09:31:38 CET 2021
 detection=Mechanical
 disabled=false
diff --git a/devices/D3.properties b/devices/D3.properties
index 5572f25..77d7a95 100644
--- a/devices/D3.properties
+++ b/devices/D3.properties
@@ -1,3 +1,3 @@
-#Tue Sep 08 09:29:02 CEST 2020
+#Tue Nov 30 09:31:42 CET 2021
 detection=Mechanical
 disabled=false
diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties
index 7d6c1e6..2b9c45b 100644
--- a/devices/led_ctrl_1.properties
+++ b/devices/led_ctrl_1.properties
@@ -1,4 +1,4 @@
-#Wed Oct 27 14:03:14 CEST 2021
+#Wed Dec 01 08:50:46 CET 2021
 minValue=0.0
 unit=V
 offset=0.0
diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties
index 7d6c1e6..2b9c45b 100644
--- a/devices/led_ctrl_2.properties
+++ b/devices/led_ctrl_2.properties
@@ -1,4 +1,4 @@
-#Wed Oct 27 14:03:14 CEST 2021
+#Wed Dec 01 08:50:46 CET 2021
 minValue=0.0
 unit=V
 offset=0.0
diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties
index 7d6c1e6..2b9c45b 100644
--- a/devices/led_ctrl_3.properties
+++ b/devices/led_ctrl_3.properties
@@ -1,4 +1,4 @@
-#Wed Oct 27 14:03:14 CEST 2021
+#Wed Dec 01 08:50:46 CET 2021
 minValue=0.0
 unit=V
 offset=0.0
diff --git a/script/motion/mount.py b/script/motion/mount.py
index 7657f6c..f500749 100644
--- a/script/motion/mount.py
+++ b/script/motion/mount.py
@@ -20,9 +20,15 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
     delayed_chill = False
     pos = get_setting("mounted_sample_position")
     if pos is not None:
-        ss, pp , mm = pos[0:1], int(pos[1]), int(pos[2:])
-        delayed_chill = 'X' == ss and needs_chilling
-
+        try:
+            ss, pp , mm = pos[0:1], int(pos[1]), int(pos[2:])
+            delayed_chill = 'X' == ss and needs_chilling
+        except:            
+            err_msg = "Invalid mounted sample position: " + str(pos) + " - setting to None";
+            log(err_msg , False)
+            set_setting("mounted_sample_position", None)
+            if auto_unmount:
+                raise Exception(err_msg)
     puck_address = get_puck_address(puck)
     if puck_address is None:
         puck_obj = get_puck_obj_by_id(puck)
@@ -158,7 +164,7 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
         update_samples_info_sample_mount(get_puck_name(segment, puck), sample, mount_sample_detected, mount_sample_id)      
 
         if mount_sample_detected == False:
-           raise Exception("SAMPLE MISSING: No pin detected on gonio")
+           raise Exception("MISSING SAMPLE: No pin detected on gonio")
 
         keep_gripper_warm = was_cold and is_aux
     
@@ -166,7 +172,7 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
             print "Auto dry after setting magnet to default current"
             smart_magnet.set_default_current()
             log("Starting auto dry", False)
-            if keep_gripper_warm:
+            if keep_gripper_warm or is_aux:
                 set_exec_pars(then = "dry(wait_cold = -1)")
             else:
                 set_exec_pars(then = "dry()")
diff --git a/script/motion/unmount.py b/script/motion/unmount.py
index bde4d80..0f80358 100644
--- a/script/motion/unmount.py
+++ b/script/motion/unmount.py
@@ -13,8 +13,13 @@ def unmount(segment = None, puck = None, sample = None, force=False, auto_unmoun
         pos = get_setting("mounted_sample_position")
         if pos is None:
             raise Exception("Mounted sample position is not defined")
-        segment, puck , sample = pos[0:1], int(pos[1]), int(pos[2:])
-        print "Mounted sample position: ", segment, puck , sample
+        try:            
+            segment, puck , sample = pos[0:1], int(pos[1]), int(pos[2:])
+            print "Mounted sample position: ", segment, puck , sample
+        except:
+            set_setting("mounted_sample_position", None)
+            raise Exception("Invalid mounted sample position: " + str(pos) + " - setting to None")
+            
 
     was_cold = robot.is_cold()
     is_aux = segment == AUX_SEGMENT