diff --git a/library/univention_config_registry.py b/library/univention_config_registry.py
index 28107bf..8bf4213 100755
--- a/library/univention_config_registry.py
+++ b/library/univention_config_registry.py
@@ -123,7 +123,7 @@ def _set_keys(keys, result, module):
     result['rc']                   = rc
     result['message']              = "These keys were set: {}".format(" ".join(to_set))
     result['meta']['changed_keys'] = to_set
-    result['failed']               = rc != 0
+    result['failed']               = rc != 0 or len(err) > 0
 
     if rc != 0:
         module.fail_json(msg='non-zero return code', **result)
@@ -160,7 +160,7 @@ def _unset_keys(keys, result, module):
     result['rc']                   = rc
     result['message']              = "These keys were unset: {}".format(" ".join(to_unset))
     result['meta']['changed_keys'] = to_unset
-    result['failed']               = rc != 0
+    result['failed']               = rc != 0 
 
     if rc != 0:
         module.fail_json(msg='non-zero return code', **result)