diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index 266bdda45..201921afe 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -450,7 +450,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
         else
         {
             if (m_is_glsl)
-                m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, true);
+                m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, false);
             else
                 m_node = irr_driver->addParticleNode();
             
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index d2713f032..b04d65e5e 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -47,6 +47,8 @@ void STKBillboard::render()
     core::vector3df pos = getAbsolutePosition();
     glBindVertexArray(billboardvao);
     video::ITexture *tex = Material.getTexture(0);
+    if (tex == NULL)
+        return;
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
     setTexture(0, texid, GL_LINEAR, GL_LINEAR);