From ccfaa64ecbdb52d4037c3ad9f45ead323117acf9 Mon Sep 17 00:00:00 2001
From: Matthew Harrison-Jones <matthojo@gmail.com>
Date: Mon, 6 Feb 2017 17:10:20 +0000
Subject: [PATCH] Fix world.destroy()

---
 src/World.js                              | 4 +++-
 src/layer/environment/EnvironmentLayer.js | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/World.js b/src/World.js
index 4175424..808d86a 100644
--- a/src/World.js
+++ b/src/World.js
@@ -153,7 +153,9 @@ class World extends EventEmitter {
 
   _removeAttribution(id) {
     var elem = document.querySelectorAll('#attribution-container [data-layer="' + id + '"]')[0];
-    elem.remove();
+    if (elem) {
+      elem.remove();
+    }
   }
 
   // Set world view
diff --git a/src/layer/environment/EnvironmentLayer.js b/src/layer/environment/EnvironmentLayer.js
index 81d2fd1..9d47705 100644
--- a/src/layer/environment/EnvironmentLayer.js
+++ b/src/layer/environment/EnvironmentLayer.js
@@ -129,9 +129,11 @@ class EnvironmentLayer extends Layer {
   destroy() {
     this._skyboxLight = null;
 
-    this.remove(this._skybox._mesh);
-    this._skybox.destroy();
-    this._skybox = null;
+    if (this._skybox) {
+      this.remove(this._skybox._mesh);
+      this._skybox.destroy();
+      this._skybox = null;
+    }
 
     super.destroy();
   }