diff --git a/ceph-add-node.groovy b/ceph-add-node.groovy
index 9da7110..b233050 100644
--- a/ceph-add-node.groovy
+++ b/ceph-add-node.groovy
@@ -31,8 +31,8 @@
     }
 
     if (!found) {
-            common.errorMsg("No such HOST_TYPE was found. Please insert one of the following types: mon/osd/rgw")
-        break
+        common.errorMsg("No such HOST_TYPE was found. Please insert one of the following types: mon/osd/rgw")
+        throw new InterruptedException()
     }
 
     if (HOST_TYPE.toLowerCase() != 'osd') {
diff --git a/ceph-remove-node.groovy b/ceph-remove-node.groovy
index f9ceead..3a38471 100644
--- a/ceph-remove-node.groovy
+++ b/ceph-remove-node.groovy
@@ -51,8 +51,8 @@
     }
 
     if (!found) {
-            common.errorMsg("No such HOST_TYPE was found. Please insert one of the following types: mon/osd/rgw")
-        break
+        common.errorMsg("No such HOST_TYPE was found. Please insert one of the following types: mon/osd/rgw")
+        throw new InterruptedException()
     }
 
     stage('Refresh_pillar') {
@@ -138,7 +138,7 @@
 
         // purge Ceph pkgs
         stage('Purge Ceph OSD pkgs') {
-            runCephCommand(pepperEnv, HOST, 'apt purge ceph-base ceph-common ceph-fuse ceph-mds ceph-osd libcephfs2 python-cephfs librados2 python-rados -y')
+            runCephCommand(pepperEnv, HOST, 'apt purge ceph-base ceph-common ceph-fuse ceph-mds ceph-osd python-cephfs librados2 python-rados -y')
         }
 
         // stop salt-minion service and move its configuration
@@ -178,8 +178,8 @@
 
         // Update configs
         stage('Update Ceph configs') {
-            for (target in target_hosts) {
-                salt.enforceState(pepperEnv, target, 'ceph.common', true)
+            for (tgt in target_hosts) {
+                salt.enforceState(pepperEnv, tgt, 'ceph.common', true)
             }
         }
     }