2 files changed, 3 insertions, 3 deletions

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index e160ffea8..09aa0041f 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -45,7 +45,7 @@ def keyboard_name(keyboard_name):
 #ifndef PRODUCT
 #    define PRODUCT %s
 #endif // PRODUCT
-""" % (keyboard_name, keyboard_name)
+""" % (keyboard_name.replace("'", ""), keyboard_name.replace("'", ""))
 
 
 def manufacturer(manufacturer):
@@ -55,7 +55,7 @@ def manufacturer(manufacturer):
 #ifndef MANUFACTURER
 #    define MANUFACTURER %s
 #endif // MANUFACTURER
-""" % (manufacturer)
+""" % (manufacturer.replace("'", ""))
 
 
 def direct_pins(direct_pins):
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 2954a17e0..4611874e8 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -345,7 +345,7 @@ def _merge_layouts(info_data, new_info_data):
         else:
             # Pull in layouts that have matrix data
             missing_matrix = False
-            for key in layout_json['layout']:
+            for key in layout_json.get('layout', {}):
                 if 'matrix' not in key:
                     missing_matrix = True