From 68665e6b2579fa63e9cf0af6ce293af78afdf1dd Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 17 May 2016 15:12:45 -0700
Subject: [PATCH] Fix JurisdictionMap not initializing correctly

---
 libraries/octree/src/JurisdictionMap.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp
index 5d5d50f4ad..fcbc085339 100644
--- a/libraries/octree/src/JurisdictionMap.cpp
+++ b/libraries/octree/src/JurisdictionMap.cpp
@@ -64,7 +64,14 @@ JurisdictionMap::JurisdictionMap(const JurisdictionMap& other) : _rootOctalCode(
 }
 
 void JurisdictionMap::copyContents(const OctalCodePtr& rootCodeIn, const OctalCodePtrList& endNodesIn) {
-    init(rootCodeIn, endNodesIn);
+    OctalCodePtr rootCode = rootCodeIn;
+    if (!rootCode) {
+        rootCode = createOctalCodePtr(1);
+        *rootCode = 0;
+    }
+
+    OctalCodePtrList emptyEndNodes;
+    init(rootCode, endNodesIn);
 }
 
 void JurisdictionMap::copyContents(const JurisdictionMap& other) {