diff --git a/cdist/conf/type/__key_value/explorer/state b/cdist/conf/type/__key_value/explorer/state
index cb7578a5..8bdd3a1d 100755
--- a/cdist/conf/type/__key_value/explorer/state
+++ b/cdist/conf/type/__key_value/explorer/state
@@ -48,6 +48,10 @@ BEGIN {
     if(i == 1) {
         delval = substr($0,length(key)+1)
         delpos = index(delval,delimiter)
+        if(delpos == 0) {
+            # in this case, the delimiter was not found
+            next
+        }
         if(delpos > 1) {
             spaces = substr(delval,1,delpos-1)
             sub(/[ \t]*/,"",spaces)
diff --git a/cdist/conf/type/__key_value/gencode-remote b/cdist/conf/type/__key_value/gencode-remote
index dc01b645..1e1d7c92 100755
--- a/cdist/conf/type/__key_value/gencode-remote
+++ b/cdist/conf/type/__key_value/gencode-remote
@@ -53,7 +53,9 @@ case "$state_should" in
             *)
                 echo "Unknown explorer state: $state_is" >&2
                 exit 1
+            ;;
         esac
+    ;;
     present)
         case "$state_is" in
             absent)
@@ -68,11 +70,13 @@ case "$state_should" in
             *)
                 echo "Unknown explorer state: $state_is" >&2
                 exit 1
+            ;;
         esac
     ;;
     *)
        echo "Unknown state: $state_should" >&2
        exit 1
+    ;;
 esac
 
 cat <<__CDIST_HEREDOC_END_HERE_MARKER
@@ -184,5 +188,4 @@ END {
 }
 AWK_EOF
 mv -f "\$tmpfile" "$file"
-exit 1
 __CDIST_HEREDOC_END_HERE_MARKER
diff --git a/cdist/conf/type/__key_value/parameter/default/comment_line b/cdist/conf/type/__key_value/parameter/default/comment_line
deleted file mode 100644
index 8b137891..00000000
--- a/cdist/conf/type/__key_value/parameter/default/comment_line
+++ /dev/null
@@ -1 +0,0 @@
-