diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp
index 17bdd3c71d..cd77cff9a9 100644
--- a/modules/space/rendering/renderableplanet.cpp
+++ b/modules/space/rendering/renderableplanet.cpp
@@ -292,16 +292,7 @@ bool RenderablePlanet::initialize() {
         LERROR(ss.str());
     }
 
-    loadTexture();
-
-    while ((err = glGetError()) != GL_NO_ERROR) {
-        const GLubyte * errString = gluErrorString(err);
-        std::stringstream ss;
-        ss << "Error loading textures. OpenGL error: " << errString << std::endl;
-        LERROR(ss.str());
-    }
-    
-    _geometry->initialize(this);    
+    _geometry->initialize(this);
 
     _programObject->deactivate();
 
@@ -309,6 +300,8 @@ bool RenderablePlanet::initialize() {
         const GLubyte * errString = gluErrorString(err);
         LERROR("Shader Programs Creation. OpenGL error: " << errString);
     }
+    
+    loadTexture();
 
     return isReady();
 }
@@ -394,13 +387,13 @@ void RenderablePlanet::render(const RenderData& data) {
     _programObject->setUniform("texture1", dayUnit);
 
     // Bind possible night texture
-    if (_hasNightTexture) {
+    if (_hasNightTexture && _nightTexture) {
         nightUnit.activate();
         _nightTexture->bind();
         _programObject->setUniform("nightTex", nightUnit);
     }
 
-    if (_hasHeightTexture) {
+    if (_hasHeightTexture && _heightMapTexture) {
         heightUnit.activate();
         _heightMapTexture->bind();
         _programObject->setUniform("heightTex", heightUnit);
diff --git a/modules/space/rendering/simplespheregeometry.h b/modules/space/rendering/simplespheregeometry.h
index 35740746df..3604050944 100644
--- a/modules/space/rendering/simplespheregeometry.h
+++ b/modules/space/rendering/simplespheregeometry.h
@@ -46,7 +46,6 @@ public:
     bool initialize(Renderable* parent) override;
     void deinitialize() override;
     void render() override;
-    PowerScaledSphere* _planet;
 
 private:
     void createSphere();