Merge branch 'dev' of github.com:jlab/qiita into dev

Author: sjanssen2

qiita_db/software.py

@@ -1620,6 +1620,11 @@ def load(cls, command, json_str=None, values_dict=None):
             error_msg = ("The provided JSON string doesn't encode a "
                          "parameter set for command %s" % command.id)
         else:
+            if not isinstance(values_dict, dict):
+                raise qdb.exceptions.QiitaDBError(
+                    "The provided value_dict is %s (i.e. not None) but also "
+                    "not a dictionary for command %s" % (
+                        values_dict, command.id))
             parameters = deepcopy(values_dict)
             error_msg = ("The provided values dictionary doesn't encode a "
                          "parameter set for command %s" % command.id)