diff --git a/metadata/src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java b/metadata/src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java
index 1bd5cb2..a73006c 100644
--- a/metadata/src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java
+++ b/metadata/src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java
@@ -34,6 +34,7 @@
 public class NamedParameterStatement {
     private static final Logger LOGGER = LoggerFactory.getLogger(NamedParameterStatement.class);
     public static final char EMPTY = ' ';
+    public static final int[] EMPTY_ARRAY = new int[]{};
 
     private final PreparedStatement statement;
     private Map<String, int[]> variablesMap;
@@ -150,7 +151,7 @@ private int[] getVariableIndexes(String name) {
         int[] indexes = variablesMap.get(name);
         if (indexes == null) {
             LOGGER.debug("getVariableIndexes didn't find the variable:{} in :{}", name, variablesMap.keySet());
-            throw new IllegalStateException("Parameter not found: " + name);
+            indexes = EMPTY_ARRAY;
         }
         return indexes;
     }