diff --git a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
index b9d1fd632..a6dbf2f18 100644
--- a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
+++ b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
@@ -46,8 +46,8 @@ namespace Barotrauma.Items.Components
             if (HighlightedWire != null)
             {
                 HighlightedWire.Item.IsHighlighted = true;
-                if (HighlightedWire.Connections[0].Item != null) HighlightedWire.Connections[0].Item.IsHighlighted = true;
-                if (HighlightedWire.Connections[1].Item != null) HighlightedWire.Connections[1].Item.IsHighlighted = true;
+                if (HighlightedWire.Connections[0] != null && HighlightedWire.Connections[0].Item != null) HighlightedWire.Connections[0].Item.IsHighlighted = true;
+                if (HighlightedWire.Connections[1] != null && HighlightedWire.Connections[1].Item != null) HighlightedWire.Connections[1].Item.IsHighlighted = true;
             }
         }
 
diff --git a/Subsurface/Source/Map/MapEntity.cs b/Subsurface/Source/Map/MapEntity.cs
index 69f2475b5..288dff844 100644
--- a/Subsurface/Source/Map/MapEntity.cs
+++ b/Subsurface/Source/Map/MapEntity.cs
@@ -421,29 +421,33 @@ namespace Barotrauma
             }
             
             //started moving selected entities
-            if (startMovingPos != Vector2.Zero && PlayerInput.LeftButtonReleased())
+            if (startMovingPos != Vector2.Zero)
             {
-                //mouse released -> move the entities to the new position of the mouse
-
-                Vector2 moveAmount = position - startMovingPos;
-                moveAmount = Submarine.VectorToWorldGrid(moveAmount);
-
-                if (moveAmount != Vector2.Zero)
+                if (PlayerInput.LeftButtonReleased())
                 {
-                    //clone
-                    if (PlayerInput.KeyDown(Keys.LeftControl) || PlayerInput.KeyDown(Keys.RightControl))
-                    {
-                        var clones = Clone(selectedList);
-                        selectedList = clones;
-                        selectedList.ForEach(c => c.Move(moveAmount));
-                    }
-                    else // move
-                    {
-                        foreach (MapEntity e in selectedList) e.Move(moveAmount);
-                    }
-                }
+                    //mouse released -> move the entities to the new position of the mouse
 
-                startMovingPos = Vector2.Zero;                
+                    Vector2 moveAmount = position - startMovingPos;
+                    moveAmount = Submarine.VectorToWorldGrid(moveAmount);
+
+                    if (moveAmount != Vector2.Zero)
+                    {
+                        //clone
+                        if (PlayerInput.KeyDown(Keys.LeftControl) || PlayerInput.KeyDown(Keys.RightControl))
+                        {
+                            var clones = Clone(selectedList);
+                            selectedList = clones;
+                            selectedList.ForEach(c => c.Move(moveAmount));
+                        }
+                        else // move
+                        {
+                            foreach (MapEntity e in selectedList) e.Move(moveAmount);
+                        }
+                    }
+
+                    startMovingPos = Vector2.Zero;    
+                }
+                           
             }
             //started dragging a "selection rectangle"
             else if (selectionPos != Vector2.Zero)