From e80f3c87e97e0f9ab9fa1b768f1da71166750077 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 16 Oct 2017 13:20:33 -0500
Subject: [PATCH] Zone: Main loop crash fix

---
 zone/net.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zone/net.cpp b/zone/net.cpp
index eafdde807..80411af7b 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -542,8 +542,10 @@ int main(int argc, char** argv) {
 			process_timer.Stop();
 			process_timer.Start(1000, true);
 
-			uint32 shutdown_timer = database.getZoneShutDownDelay(zone->GetZoneID(), zone->GetInstanceVersion());
-			zone->StartShutdownTimer(shutdown_timer);
+			if (zone && zone->GetZoneID() && zone->GetInstanceVersion()) {
+				uint32 shutdown_timer = database.getZoneShutDownDelay(zone->GetZoneID(), zone->GetInstanceVersion());
+				zone->StartShutdownTimer(shutdown_timer);
+			}
 		}
 		else if (!previous_loaded && current_loaded) {
 			process_timer.Stop();