diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
index f4ae6fe0e1..a507c0c37b 100644
--- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
+++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
@@ -2922,6 +2922,10 @@ public void updateBufferData(VertexBuffer vb) {
 
             //statistics.onNewVertexBuffer();
 
+            if (debug && caps.contains(Caps.GLDebug)) {
+                glext.glObjectLabel(GLExt.GL_BUFFER, bufId, vb.getName());
+            }
+
             created = true;
         }
 
@@ -3219,9 +3223,6 @@ public void setVertexAttrib(VertexBuffer vb, VertexBuffer idb) {
                 attribs[slot] = vb.getWeakRef();
             }
         }
-        if (debug && caps.contains(Caps.GLDebug)) {
-            if (vb.getName() != null) glext.glObjectLabel(GLExt.GL_BUFFER, vb.getId(), vb.getName());
-        }
     }
 
     public void setVertexAttrib(VertexBuffer vb) {