diff --git a/modules/post/windows/gather/credentials/gpp.rb b/modules/post/windows/gather/credentials/gpp.rb
index 277cf69018..8ed85dbbc3 100644
--- a/modules/post/windows/gather/credentials/gpp.rb
+++ b/modules/post/windows/gather/credentials/gpp.rb
@@ -83,10 +83,10 @@ class Metasploit3 < Msf::Post
 
 		# Add user specified domains to list.
 		if !datastore['DOMAINS'].blank?
-			#if datastore['DOMAINS'].match(/./)
-			#	print_error "DOMAINS must not contain DNS style domain names e.g. 'mydomain.net'. Instead use 'mydomain'."
-			#	return
-			#end
+			if datastore['DOMAINS'].match(/./)
+				print_error "DOMAINS must not contain DNS style domain names e.g. 'mydomain.net'. Instead use 'mydomain'."
+				return
+			end
 			user_domains = datastore['DOMAINS'].split(' ')
 			user_domains = user_domains.map {|x| x.upcase}
 			print_status "Enumerating the user supplied Domain(s): #{user_domains.join(', ')}..."