From c97b54fe56a5eb22332171f3d0c95d6173412806 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Thu, 22 Jan 2015 15:03:54 +0000
Subject: [PATCH] Fixes power runtime

---
 code/modules/power/power.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index d1f0c824548..366cd9351d4 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -294,6 +294,8 @@
 	for(var/obj/structure/cable/Cable in net2.cables) //merge cables
 		net1.add_cable(Cable)
 
+	if(!net2) return net1
+
 	for(var/obj/machinery/power/Node in net2.nodes) //merge power machines
 		if(!Node.connect_to_network())
 			Node.disconnect_from_network() //if somehow we can't connect the machine to the new powernet, disconnect it from the old nonetheless