diff --git a/src/PluginUtils/_Tool.py b/src/PluginUtils/_Tool.py
index 35e2a2599..204ed1447 100644
--- a/src/PluginUtils/_Tool.py
+++ b/src/PluginUtils/_Tool.py
@@ -86,10 +86,11 @@ class Tool(object):
             if issubclass(options_class, MenuToolOptions):
                 # FIXME: pass in person_id
                 self.options = options_class(name, None, dbstate)
-            else:   # must be some kind of class or we get a TypeError
-                self.options = options_class(name)
         except TypeError:
             self.options = options_class
+        else:   # must be some kind of class or we get a TypeError
+            self.options = options_class(name)
+        
         self.options.load_previous_values()
 
     def run_tool(self):