diff --git a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
index 6051b4b54..abb89a5f0 100644
--- a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
+++ b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
@@ -158,10 +158,10 @@ public class GeometryBatchFactory {
                 VertexBuffer inBuf = inMesh.getBuffer(Type.values()[bufType]);
                 VertexBuffer outBuf = outMesh.getBuffer(Type.values()[bufType]);
 
-                if (outBuf == null) {
+                if (inBuf == null || outBuf == null) {
                     continue;
                 }
-
+                
                 if (Type.Index.ordinal() == bufType) {
                     int components = compsForBuf[bufType];