diff --git a/saltcloud/cloud.py b/saltcloud/cloud.py
index be8439d7..8a3a7c88 100644
--- a/saltcloud/cloud.py
+++ b/saltcloud/cloud.py
@@ -1099,7 +1099,7 @@ def map_data(self, cached=False):
                 # merge minion grains from map file
                 if 'minion' in overrides:
                     if 'grains' in overrides['minion']:
-                        if 'grains' in nodedata['minion']:
+                        if 'grains' in nodedata.get('minion', {}):
                             nodedata['minion']['grains'].update(
                                 overrides['minion']['grains']
                             )