diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index ec7a91e..23e3c45 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -105,7 +105,7 @@ def resolve_tasks(taskset, manifest):
 		                ])
 		taskset.discard(filesystem.FStab)
 
-	if 'enhanced_networking' in manifest.provider and manifest.provider['enhanced_networking'] == 'simple':
+	if manifest.provider.get('enhanced_networking', None) == 'simple':
 		taskset.update([kernel.AddDKMSPackages,
 		                tasks.network.InstallEnhancedNetworking,
 		                kernel.UpdateInitramfs])
diff --git a/bootstrapvz/providers/ec2/tasks/ami.py b/bootstrapvz/providers/ec2/tasks/ami.py
index 752d807..4218294 100644
--- a/bootstrapvz/providers/ec2/tasks/ami.py
+++ b/bootstrapvz/providers/ec2/tasks/ami.py
@@ -121,7 +121,7 @@ class RegisterAMI(Task):
 			registration_params['kernel_id'] = config_get(akis_path, [info._ec2['region'],
 			                                                          info.manifest.system['architecture']])
 
-		if 'enhanced_networking' in info.manifest.provider and info.manifest.provider['enhanced_networking'] == 'simple':
+		if info.manifest.provider.get('enhanced_networking', None) == 'simple':
 			registration_params['sriov_net_support'] = 'simple'
 
 		info._ec2['image'] = info._ec2['connection'].register_image(**registration_params)