diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 34c2f7b0..77cbe986 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,7 +1,6 @@
 - cleanup object_id handling
     - have a look at singletons
     - double check verification
-    - cleanup emulator to create object
     - adjust tests
 
 --------------------------------------------------------------------------------
diff --git a/lib/cdist/emulator.py b/lib/cdist/emulator.py
index 64773334..5e95e31c 100644
--- a/lib/cdist/emulator.py
+++ b/lib/cdist/emulator.py
@@ -151,9 +151,9 @@ class Emulator(object):
             self.log.debug("reqs = " + requirements)
             for requirement in requirements.split(" "):
                 # Ignore empty fields - probably the only field anyway
-                if len(requirement) == 0:
-                    continue
+                if len(requirement) == 0: continue
 
+                # Raises an error, if object cannot be created
                 self.cdist_object.object_from_name(requirement)
                 self.log.debug("Recording requirement: " + requirement)
                 self.cdist_object.requirements.append(requirement)