diff --git a/data/MPL/MPL.xml b/data/MPL/MPL.xml
index 5800a1200..2b8408323 100644
--- a/data/MPL/MPL.xml
+++ b/data/MPL/MPL.xml
@@ -49,30 +49,30 @@
     </visual>
 
     <asset>
-		<mesh name="index0" 	file="index0.stl"/>
-		<mesh name="index1" 	file="index1.stl"/>
-		<mesh name="index2" 	file="index2.stl"/>
-		<mesh name="index3" 	file="index3.stl"/>
-		<mesh name="middle0" 	file="middle0.stl"/>
-		<mesh name="middle1" 	file="middle1.stl"/>
-		<mesh name="middle2" 	file="middle2.stl"/>
-		<mesh name="middle3" 	file="middle3.stl"/>
+		<mesh name="index0" 	file="index0_collision.stl"/>
+		<mesh name="index1" 	file="index1_collision.stl"/>
+		<mesh name="index2" 	file="index2_collision.stl"/>
+		<mesh name="index3" 	file="index3_collision.stl"/>
+		<mesh name="middle0" 	file="middle0_collision.stl"/>
+		<mesh name="middle1" 	file="middle1_collision.stl"/>
+		<mesh name="middle2" 	file="middle2_collision.stl"/>
+		<mesh name="middle3" 	file="middle3_collision.stl"/>
 		<mesh name="palm" 		file="palm.stl"/>
-		<mesh name="pinky0" 	file="pinky0.stl"/>
-		<mesh name="pinky1" 	file="pinky1.stl"/>
-		<mesh name="pinky2" 	file="pinky2.stl"/>
-		<mesh name="pinky3" 	file="pinky3.stl"/>
-		<mesh name="ring0" 		file="ring0.stl"/>
-		<mesh name="ring1" 		file="ring1.stl"/>
-		<mesh name="ring2" 		file="ring2.stl"/>
-		<mesh name="ring3" 		file="ring3.stl"/>
-		<mesh name="thumb0" 	file="thumb0.stl"/>
-		<mesh name="thumb1" 	file="thumb1.stl"/>
-		<mesh name="thumb2" 	file="thumb2.stl"/>
-		<mesh name="thumb3" 	file="thumb3.stl"/>
-		<mesh name="wristx" 	file="wristx.stl"/>
-		<mesh name="wristy" 	file="wristy.stl"/>
-		<mesh name="wristz" 	file="wristz.stl"/>
+		<mesh name="pinky0" 	file="pinky0_collision.stl"/>
+		<mesh name="pinky1" 	file="pinky1_collision.stl"/>
+		<mesh name="pinky2" 	file="pinky2_collision.stl"/>
+		<mesh name="pinky3" 	file="pinky3_collision.stl"/>
+		<mesh name="ring0" 		file="ring0_collision.stl"/>
+		<mesh name="ring1" 		file="ring1_collision.stl"/>
+		<mesh name="ring2" 		file="ring2_collision.stl"/>
+		<mesh name="ring3" 		file="ring3_collision.stl"/>
+		<mesh name="thumb0" 	file="thumb0_collision.stl"/>
+		<mesh name="thumb1" 	file="thumb1_collision.stl"/>
+		<mesh name="thumb2" 	file="thumb2_collision.stl"/>
+		<mesh name="thumb3" 	file="thumb3_collision.stl"/>
+		<mesh name="wristx" 	file="wristx_collision.stl"/>
+		<mesh name="wristy" 	file="wristy_collision.stl"/>
+		<mesh name="wristz" 	file="wristz_collision.stl"/>
         
 		<texture type="skybox" builtin="gradient" rgb1=".4 .6 .8" rgb2="0 0 0" 
 			width="100" height="100"/>
diff --git a/data/MPL/mesh/index0_collision.STL b/data/MPL/mesh/index0_collision.STL
new file mode 100644
index 000000000..9d055eb5f
Binary files /dev/null and b/data/MPL/mesh/index0_collision.STL differ
diff --git a/data/MPL/mesh/index1_collision.STL b/data/MPL/mesh/index1_collision.STL
new file mode 100644
index 000000000..9d11ac8bc
Binary files /dev/null and b/data/MPL/mesh/index1_collision.STL differ
diff --git a/data/MPL/mesh/index2_collision.STL b/data/MPL/mesh/index2_collision.STL
new file mode 100644
index 000000000..3739de3fb
Binary files /dev/null and b/data/MPL/mesh/index2_collision.STL differ
diff --git a/data/MPL/mesh/index3_collision.STL b/data/MPL/mesh/index3_collision.STL
new file mode 100644
index 000000000..ec4237308
Binary files /dev/null and b/data/MPL/mesh/index3_collision.STL differ
diff --git a/data/MPL/mesh/middle0_collision.STL b/data/MPL/mesh/middle0_collision.STL
new file mode 100644
index 000000000..1b027f78e
Binary files /dev/null and b/data/MPL/mesh/middle0_collision.STL differ
diff --git a/data/MPL/mesh/middle1_collision.STL b/data/MPL/mesh/middle1_collision.STL
new file mode 100644
index 000000000..b89440459
Binary files /dev/null and b/data/MPL/mesh/middle1_collision.STL differ
diff --git a/data/MPL/mesh/middle2_collision.STL b/data/MPL/mesh/middle2_collision.STL
new file mode 100644
index 000000000..447bf7240
Binary files /dev/null and b/data/MPL/mesh/middle2_collision.STL differ
diff --git a/data/MPL/mesh/middle3_collision.STL b/data/MPL/mesh/middle3_collision.STL
new file mode 100644
index 000000000..806a150a2
Binary files /dev/null and b/data/MPL/mesh/middle3_collision.STL differ
diff --git a/data/MPL/mesh/palm_collision.STL b/data/MPL/mesh/palm_collision.STL
new file mode 100644
index 000000000..08625a6f1
Binary files /dev/null and b/data/MPL/mesh/palm_collision.STL differ
diff --git a/data/MPL/mesh/pinky0_collision.STL b/data/MPL/mesh/pinky0_collision.STL
new file mode 100644
index 000000000..ddc637126
Binary files /dev/null and b/data/MPL/mesh/pinky0_collision.STL differ
diff --git a/data/MPL/mesh/pinky1_collision.STL b/data/MPL/mesh/pinky1_collision.STL
new file mode 100644
index 000000000..c4316bff6
Binary files /dev/null and b/data/MPL/mesh/pinky1_collision.STL differ
diff --git a/data/MPL/mesh/pinky2_collision.STL b/data/MPL/mesh/pinky2_collision.STL
new file mode 100644
index 000000000..375aa5f97
Binary files /dev/null and b/data/MPL/mesh/pinky2_collision.STL differ
diff --git a/data/MPL/mesh/pinky3_collision.STL b/data/MPL/mesh/pinky3_collision.STL
new file mode 100644
index 000000000..fc4981f0f
Binary files /dev/null and b/data/MPL/mesh/pinky3_collision.STL differ
diff --git a/data/MPL/mesh/ring0_collision.STL b/data/MPL/mesh/ring0_collision.STL
new file mode 100644
index 000000000..9d055eb5f
Binary files /dev/null and b/data/MPL/mesh/ring0_collision.STL differ
diff --git a/data/MPL/mesh/ring1_collision.STL b/data/MPL/mesh/ring1_collision.STL
new file mode 100644
index 000000000..5b1f6af50
Binary files /dev/null and b/data/MPL/mesh/ring1_collision.STL differ
diff --git a/data/MPL/mesh/ring2_collision.STL b/data/MPL/mesh/ring2_collision.STL
new file mode 100644
index 000000000..447bf7240
Binary files /dev/null and b/data/MPL/mesh/ring2_collision.STL differ
diff --git a/data/MPL/mesh/ring3_collision.STL b/data/MPL/mesh/ring3_collision.STL
new file mode 100644
index 000000000..ec4237308
Binary files /dev/null and b/data/MPL/mesh/ring3_collision.STL differ
diff --git a/data/MPL/mesh/thumb0_collision.STL b/data/MPL/mesh/thumb0_collision.STL
new file mode 100644
index 000000000..dea0dc8f0
Binary files /dev/null and b/data/MPL/mesh/thumb0_collision.STL differ
diff --git a/data/MPL/mesh/thumb1_collision.STL b/data/MPL/mesh/thumb1_collision.STL
new file mode 100644
index 000000000..97fe1dc9c
Binary files /dev/null and b/data/MPL/mesh/thumb1_collision.STL differ
diff --git a/data/MPL/mesh/thumb2_collision.STL b/data/MPL/mesh/thumb2_collision.STL
new file mode 100644
index 000000000..5b1f67f53
Binary files /dev/null and b/data/MPL/mesh/thumb2_collision.STL differ
diff --git a/data/MPL/mesh/thumb3_collision.STL b/data/MPL/mesh/thumb3_collision.STL
new file mode 100644
index 000000000..373c2434d
Binary files /dev/null and b/data/MPL/mesh/thumb3_collision.STL differ
diff --git a/data/MPL/mesh/wristx_collision.STL b/data/MPL/mesh/wristx_collision.STL
new file mode 100644
index 000000000..d6d5ee465
Binary files /dev/null and b/data/MPL/mesh/wristx_collision.STL differ
diff --git a/data/MPL/mesh/wristy_collision.STL b/data/MPL/mesh/wristy_collision.STL
new file mode 100644
index 000000000..4aa00412e
Binary files /dev/null and b/data/MPL/mesh/wristy_collision.STL differ
diff --git a/data/MPL/mesh/wristz_collision.STL b/data/MPL/mesh/wristz_collision.STL
new file mode 100644
index 000000000..95a0f9b48
Binary files /dev/null and b/data/MPL/mesh/wristz_collision.STL differ
diff --git a/data/MPL/mpl2.xml b/data/MPL/mpl2.xml
index 7205b15ad..327e72778 100644
--- a/data/MPL/mpl2.xml
+++ b/data/MPL/mpl2.xml
@@ -49,30 +49,30 @@
     </visual>
 
     <asset>
-		<mesh name="index0" 	file="index0.stl"/>
-		<mesh name="index1" 	file="index1.stl"/>
-		<mesh name="index2" 	file="index2.stl"/>
-		<mesh name="index3" 	file="index3.stl"/>
-		<mesh name="middle0" 	file="middle0.stl"/>
-		<mesh name="middle1" 	file="middle1.stl"/>
-		<mesh name="middle2" 	file="middle2.stl"/>
-		<mesh name="middle3" 	file="middle3.stl"/>
-		<mesh name="palm" 		file="palm.stl"/>
-		<mesh name="pinky0" 	file="pinky0.stl"/>
-		<mesh name="pinky1" 	file="pinky1.stl"/>
-		<mesh name="pinky2" 	file="pinky2.stl"/>
-		<mesh name="pinky3" 	file="pinky3.stl"/>
-		<mesh name="ring0" 		file="ring0.stl"/>
-		<mesh name="ring1" 		file="ring1.stl"/>
-		<mesh name="ring2" 		file="ring2.stl"/>
-		<mesh name="ring3" 		file="ring3.stl"/>
-		<mesh name="thumb0" 	file="thumb0.stl"/>
-		<mesh name="thumb1" 	file="thumb1.stl"/>
-		<mesh name="thumb2" 	file="thumb2.stl"/>
-		<mesh name="thumb3" 	file="thumb3.stl"/>
-		<mesh name="wristx" 	file="wristx.stl"/>
-		<mesh name="wristy" 	file="wristy.stl"/>
-		<mesh name="wristz" 	file="wristz.stl"/>
+		<mesh name="index0" 	file="index0_collision.stl"/>
+		<mesh name="index1" 	file="index1_collision.stl"/>
+		<mesh name="index2" 	file="index2_collision.stl"/>
+		<mesh name="index3" 	file="index3_collision.stl"/>
+		<mesh name="middle0" 	file="middle0_collision.stl"/>
+		<mesh name="middle1" 	file="middle1_collision.stl"/>
+		<mesh name="middle2" 	file="middle2_collision.stl"/>
+		<mesh name="middle3" 	file="middle3_collision.stl"/>
+		<mesh name="palm" 		file="palm_collision.stl"/>
+		<mesh name="pinky0" 	file="pinky0_collision.stl"/>
+		<mesh name="pinky1" 	file="pinky1_collision.stl"/>
+		<mesh name="pinky2" 	file="pinky2_collision.stl"/>
+		<mesh name="pinky3" 	file="pinky3_collision.stl"/>
+		<mesh name="ring0" 		file="ring0_collision.stl"/>
+		<mesh name="ring1" 		file="ring1_collision.stl"/>
+		<mesh name="ring2" 		file="ring2_collision.stl"/>
+		<mesh name="ring3" 		file="ring3_collision.stl"/>
+		<mesh name="thumb0" 	file="thumb0_collision.stl"/>
+		<mesh name="thumb1" 	file="thumb1_collision.stl"/>
+		<mesh name="thumb2" 	file="thumb2_collision.stl"/>
+		<mesh name="thumb3" 	file="thumb3_collision.stl"/>
+		<mesh name="wristx" 	file="wristx_collision.stl"/>
+		<mesh name="wristy" 	file="wristy_collision.stl"/>
+		<mesh name="wristz" 	file="wristz_collision.stl"/>
         
 		<texture type="skybox" builtin="gradient" rgb1=".4 .6 .8" rgb2="0 0 0" 
 			width="100" height="100"/>
diff --git a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
index 65bdd330b..95cd93ef3 100644
--- a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
+++ b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
@@ -98,8 +98,11 @@ static GLInstanceGraphicsShape* LoadMeshFromSTL(const char* relativeFileName)
 		}
 		fclose(file);
 	}
-	shape->m_numIndices = shape->m_indices->size();
-	shape->m_numvertices = shape->m_vertices->size();
+	if (shape)
+	{
+		shape->m_numIndices = shape->m_indices->size();
+		shape->m_numvertices = shape->m_vertices->size();
+	}
 	return shape;
 }