diff --git a/public/app/plugins/datasource/postgres/sql_part.ts b/public/app/plugins/datasource/postgres/sql_part.ts
index 8de764c45e9..e39a339c9da 100644
--- a/public/app/plugins/datasource/postgres/sql_part.ts
+++ b/public/app/plugins/datasource/postgres/sql_part.ts
@@ -6,7 +6,7 @@ var index = [];
 function createPart(part): any {
   var def = index[part.type];
   if (!def) {
-    throw { message: 'Could not find query part ' + part.type };
+    return null;
   }
 
   return new SqlPart(part, def);