diff --git a/Changes.md b/Changes.md
index 68f60877515..f30adc117c1 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,7 +1,10 @@
 1.5.x.x (relative to 1.5.2.0)
 =======
 
+Fixes
+-----
 
+- VisualiserTool : Fix error when trying to visualise data unsupported data.
 
 1.5.2.0 (relative to 1.5.1.0)
 =======
diff --git a/src/GafferSceneUI/VisualiserTool.cpp b/src/GafferSceneUI/VisualiserTool.cpp
index 70a5551eacf..989847ef22a 100644
--- a/src/GafferSceneUI/VisualiserTool.cpp
+++ b/src/GafferSceneUI/VisualiserTool.cpp
@@ -413,12 +413,6 @@ class VisualiserGadget : public Gadget
 						continue;
 					}
 
-					IECoreGL::ConstBufferPtr vBuffer = meshGL->getVertexBuffer( name );
-					if( !vBuffer )
-					{
-						continue;
-					}
-
 					ConstDataPtr vData = vIt->second.data;
 					GLsizei stride = 0;
 					GLenum type = GL_FLOAT;
@@ -452,6 +446,12 @@ class VisualiserGadget : public Gadget
 							continue;
 					}
 
+					IECoreGL::ConstBufferPtr vBuffer = meshGL->getVertexBuffer( name );
+					if( !vBuffer )
+					{
+						continue;
+					}
+
 					// Get the object to world transform
 
 					M44f o2w;