diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index 6337744a9..c7fd93510 100644
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -70,5 +70,10 @@ bool Zone::IsChildOf(const Zone::Ptr& zone)
 
 Zone::Ptr Zone::GetLocalZone(void)
 {
-	return Endpoint::GetLocalEndpoint()->GetZone();
+	Endpoint::Ptr local = Endpoint::GetLocalEndpoint();
+
+	if (!local)
+		return Zone::Ptr();
+
+	return local->GetZone();
 }