diff --git a/Core/Camera/LumixManager.cs b/Core/Camera/LumixManager.cs
index 15565e1..e9d8b38 100644
--- a/Core/Camera/LumixManager.cs
+++ b/Core/Camera/LumixManager.cs
@@ -173,8 +173,8 @@ private void Camera_Disconnected(Lumix obj, bool stillAvailable)
                     foundDevices.Remove(usn + host);
                     Debug.WriteLine("Undiscovered: " + usn, "Discovery");
                 }
-                Debug.WriteLine("Remove listener: " + host, "UDP");
 
+                Debug.WriteLine("Remove listener: " + host, "UDP");
             }
             else
             {
diff --git a/GMaster/Views/Commands/CameraDisconnectCommand.cs b/GMaster/Views/Commands/CameraDisconnectCommand.cs
index 29f12ba..89ebe64 100644
--- a/GMaster/Views/Commands/CameraDisconnectCommand.cs
+++ b/GMaster/Views/Commands/CameraDisconnectCommand.cs
@@ -11,7 +11,11 @@ public class CameraDisconnectCommand : AbstractParameterModelCommand<MainPageMod
 
         protected override async Task InternalExecute(ConnectedCamera parameter)
         {
-            await parameter.Camera.Disconnect();
+            var camera = parameter.Camera;
+            if (camera != null)
+            {
+                await camera.Disconnect();
+            }
         }
     }
 }
\ No newline at end of file