diff --git a/beets/library.py b/beets/library.py
index 01f688a34..20d22dbbf 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -517,7 +517,7 @@ class BaseLibrary(object):
             return AndQuery.from_string(val, default_fields)
         elif isinstance(val, Query):
             return val
-        elif not isinstance(query, Query):
+        elif not isinstance(val, Query):
             raise ValueError('query must be None or have type Query or str')
 
 
diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
old mode 100755
new mode 100644
diff --git a/beetsplug/bpd/gstplayer.py b/beetsplug/bpd/gstplayer.py
old mode 100755
new mode 100644