diff --git a/nexxT/core/BaseGraph.py b/nexxT/core/BaseGraph.py
index 9680e0c..85317c8 100644
--- a/nexxT/core/BaseGraph.py
+++ b/nexxT/core/BaseGraph.py
@@ -105,11 +105,19 @@ def renameNode(self, oldName, newName):
         self._nodes[newName] = of
         for i, c in enumerate(self._connections):
             c = self._connections[i]
+            oldConn = c
+            changed = False
             if c[0] == oldName:
                 c = (newName, c[1], c[2], c[3])
+                changed = True
             if c[2] == oldName:
                 c = (c[0], c[1], newName, c[3])
-            self._connections[i] = c
+                changed = True
+            if changed:
+                self._connections[i] = c
+                p = self._connectionProps[oldConn]
+                del self._connectionProps[oldConn]
+                self._connectionProps[c] = p            
         self.nodeRenamed.emit(oldName, newName)
         self.dirtyChanged.emit()
 
diff --git a/nexxT/tests/src/CameraGrabber.cpp b/nexxT/tests/src/CameraGrabber.cpp
index b5234a9..d8ba806 100644
--- a/nexxT/tests/src/CameraGrabber.cpp
+++ b/nexxT/tests/src/CameraGrabber.cpp
@@ -34,6 +34,10 @@ CameraGrabber::CameraGrabber(BaseFilterEnvironment *env)
     {
         devices.push_back(cameraDevice.description());
     }
+    if(devices.size() == 0)
+    {
+        devices.push_back("dummy");
+    }
     pc->defineProperty("device", devices[0], "the camera device", {{"enum", devices}});
 }