diff --git a/libs/ardour/linux_vst_info_file.cc b/libs/ardour/linux_vst_info_file.cc
index b224220eea..8eff37e77a 100644
--- a/libs/ardour/linux_vst_info_file.cc
+++ b/libs/ardour/linux_vst_info_file.cc
@@ -5,6 +5,7 @@
 /***********************************************************/
 
 #include <iostream>
+#include <cassert>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -279,6 +280,8 @@ int vstfx_can_midi (VSTState* vstfx)
 static VSTInfo *
 vstfx_info_from_plugin (VSTState* vstfx)
 {
+	assert (vstfx);
+	
 	VSTInfo* info = (VSTInfo*) malloc (sizeof (VSTInfo));
 	
 	AEffect *plugin;
@@ -290,12 +293,6 @@ vstfx_info_from_plugin (VSTState* vstfx)
 	
 	char creator[65] = "Unknown\0";
 	
-	if(!vstfx)
-	{
-		vstfx_error( "** ERROR ** VSTFXinfofile : vstfx ptr is 0\n" );
-		return 0;
-	}
-	
 	if(!info)
 		return 0;