diff --git a/lib/puppet/provider/rds_instance/v2.rb b/lib/puppet/provider/rds_instance/v2.rb
index 5924f318..973679b2 100644
--- a/lib/puppet/provider/rds_instance/v2.rb
+++ b/lib/puppet/provider/rds_instance/v2.rb
@@ -68,7 +68,7 @@ def self.db_instance_to_hash(region, instance)
       db_parameter_group_name: instance.db_parameter_groups.collect(&:db_parameter_group_name).first,
       db_security_groups: instance.db_security_groups.collect(&:db_security_group_name),
     }
-    if instance.respond_to?('endpoint')
+    if instance.respond_to?('endpoint') && !instance.endpoint.nil?
       config[:endpoint] = instance.endpoint.address
       config[:port]     = instance.endpoint.port
     end