Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 3e5663a29..cbc5bff51 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -17,9 +17,12 @@ def json_load(json_file):
     try:
         return hjson.load(json_file.open(encoding='utf-8'))
 
-    except json.decoder.JSONDecodeError as e:
+    except (json.decoder.JSONDecodeError, hjson.HjsonDecodeError) as e:
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
         exit(1)
+    except Exception as e:
+        cli.log.error('Unknown error attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
+        exit(1)
 
 
 def load_jsonschema(schema_name):