diff --git a/conf/type/__key_value/explorer/value b/conf/type/__key_value/explorer/value
index 3afc7cc5..b4e1fafd 100755
--- a/conf/type/__key_value/explorer/value
+++ b/conf/type/__key_value/explorer/value
@@ -21,11 +21,9 @@
 # Get the current value of key or __NOTSET__ if the key doesn't exist.
 #
 
-if [ -f "$__object/parameter/key" ]; then
-   key="$(cat "$__object/parameter/key")"
-else
-   key="$__object_id"
-fi
+key="$(cat "$__object/parameter/key" 2>/dev/null \
+   || echo "$__object_id")"
+
 file="$(cat "$__object/parameter/file")"
 delimiter="$(cat "$__object/parameter/delimiter")"
 
diff --git a/conf/type/__key_value/manifest b/conf/type/__key_value/manifest
index 706b0b0d..84c06352 100755
--- a/conf/type/__key_value/manifest
+++ b/conf/type/__key_value/manifest
@@ -18,9 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-if [ -f "$__object/parameter/key" ]; then
-   key="$(cat "$__object/parameter/key")"
-else
-   echo "$__object_id" > "$__object/parameter/key"
-fi
-
+# set defaults
+[ -f "$__object/parameter/key" ] \
+   || echo "$__object_id" > "$__object/parameter/key"