1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
index 14cce0aa59..bab518b0ec 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
@@ -55,6 +55,10 @@ public class JMSSelectorFilter implements MessageFilter
         {
             _matcher = new SelectorParser().parse(selector);
         }
+        catch (ParseException e)
+        {
+            throw new AMQInternalException("Unable to parse selector \""+selector+"\"", e);
+        }
         catch (SelectorParsingException e)
         {
             throw new AMQInternalException("Unable to parse selector \""+selector+"\"", e);