diff --git a/awx/plugins/inventory/ec2.ini.example b/awx/plugins/inventory/ec2.ini.example
index 1866f0bf3d..1d7428b2ed 100644
--- a/awx/plugins/inventory/ec2.ini.example
+++ b/awx/plugins/inventory/ec2.ini.example
@@ -35,6 +35,9 @@ destination_variable = public_dns_name
 # private subnet, this should be set to 'private_ip_address', and Ansible must
 # be run from within EC2. The key of an EC2 tag may optionally be used; however
 # the boto instance variables hold precedence in the event of a collision.
+# WARNING: - instances that are in the private vpc, _without_ public ip address 
+# will not be listed in the inventory untill You set: 
+# vpc_destination_variable = 'private_ip_address'
 vpc_destination_variable = ip_address
 
 # To tag instances on EC2 with the resource records that point to them from
@@ -88,10 +91,10 @@ group_by_rds_engine = True
 group_by_rds_parameter_group = True
 
 # If you only want to include hosts that match a certain regular expression
-# pattern_include = stage-*
+# pattern_include = staging-*
 
 # If you want to exclude any hosts that match a certain regular expression
-# pattern_exclude = stage-*
+# pattern_exclude = staging-*
 
 # Instance filters can be used to control which instances are retrieved for
 # inventory. For the full list of possible filters, please read the EC2 API
@@ -99,14 +102,14 @@ group_by_rds_parameter_group = True
 # Filters are key/value pairs separated by '=', to list multiple filters use
 # a list separated by commas. See examples below.
 
-# Retrieve only instances with (key=value) env=stage tag
-# instance_filters = tag:env=stage
+# Retrieve only instances with (key=value) env=staging tag
+# instance_filters = tag:env=staging
 
 # Retrieve only instances with role=webservers OR role=dbservers tag
 # instance_filters = tag:role=webservers,tag:role=dbservers
 
-# Retrieve only t1.micro instances OR instances with tag env=stage
-# instance_filters = instance-type=t1.micro,tag:env=stage
+# Retrieve only t1.micro instances OR instances with tag env=staging
+# instance_filters = instance-type=t1.micro,tag:env=staging
 
 # You can use wildcards in filter values also. Below will list instances which
 # tag Name value matches webservers1*
diff --git a/awx/plugins/inventory/ec2.py b/awx/plugins/inventory/ec2.py
index 16ac93f5ee..112f5c29e8 100755
--- a/awx/plugins/inventory/ec2.py
+++ b/awx/plugins/inventory/ec2.py
@@ -520,7 +520,10 @@ class Ec2Inventory(object):
         # Inventory: Group by tag keys
         if self.group_by_tag_keys:
             for k, v in instance.tags.items():
-                key = self.to_safe("tag_" + k + "=" + v)
+                if v:
+                    key = self.to_safe("tag_" + k + "=" + v)
+                else:
+                    key = self.to_safe("tag_" + k)
                 self.push(self.inventory, key, dest)
                 if self.nested_groups:
                     self.push_group(self.inventory, 'tags', self.to_safe("tag_" + k))