diff --git a/bootstrapvz/plugins/ec2_launch/tasks.py b/bootstrapvz/plugins/ec2_launch/tasks.py
index ec2d7b9..f7134e0 100644
--- a/bootstrapvz/plugins/ec2_launch/tasks.py
+++ b/bootstrapvz/plugins/ec2_launch/tasks.py
@@ -61,7 +61,7 @@ class PrintPublicIPAddress(Task):
             info._ec2['instance'] = conn.describe_instances(InstanceIds=[info._ec2['instance']['InstanceId']])['Reservations'][0]['Instances'][0]
             logger.info('******* EC2 IP ADDRESS: %s *******' % info._ec2['instance']['PublicIpAddress'])
             f.write(info._ec2['instance']['PublicIpAddress'])
-        except:
+        except Exception:
             logger.error('Could not get IP address for the instance')
             f.write('')
 
diff --git a/tests/system/providers/docker/image.py b/tests/system/providers/docker/image.py
index 9ef29d1..af4f1f8 100644
--- a/tests/system/providers/docker/image.py
+++ b/tests/system/providers/docker/image.py
@@ -14,7 +14,7 @@ class Image(object):
         self.container.create()
         try:
             self.container.start()
-        except:
+        except Exception:
             self.container.destroy()
             raise
         return self.container