diff --git a/py/AttackWPA.py b/py/AttackWPA.py
index d2d8ac7..771593a 100644
--- a/py/AttackWPA.py
+++ b/py/AttackWPA.py
@@ -141,7 +141,7 @@ class AttackWPA(Attack):
                      " wordlist {R}%s{O} was not found" % wordlist)
             return None
 
-        Color.pl("\n{+} {C}Cracking Handshake:{W} Using {C}aircrack-ng{W} via" +
+        Color.pl("\n{+} {C}Cracking WPA Handshake:{W} Using {C}aircrack-ng{W} via" +
                 " {C}%s{W} wordlist" % os.path.split(wordlist)[-1])
 
         key_file = Configuration.temp('wpakey.txt')
@@ -178,7 +178,7 @@ class AttackWPA(Attack):
             else:
                 continue
 
-            status = "\r{+} {C}Cracking Handshake: %0.2f%%{W}" % percent
+            status = "\r{+} {C}Cracking WPA Handshake: %0.2f%%{W}" % percent
             status += " ETA: {C}%s{W}" % eta_str
             status += " @ {C}%0.1fkps{W}" % num_kps
             #status += " ({C}%d{W}/{C}%d{W} keys)" % (num_tried, num_total)
@@ -194,7 +194,7 @@ class AttackWPA(Attack):
             f.close()
             os.remove(key_file)
 
-            Color.pl("{+} {G}Cracked Handshake{W} PSK: {G}%s{W}\n" % key)
+            Color.pl("{+} {G}Cracked WPA Handshake{W} PSK: {G}%s{W}\n" % key)
             return key
         else:
             Color.pl("{!} {R}Failed to crack handshake:" +
diff --git a/py/Configuration.py b/py/Configuration.py
index 2744544..e9a9f0e 100644
--- a/py/Configuration.py
+++ b/py/Configuration.py
@@ -169,7 +169,8 @@ class Configuration(object):
                 Configuration.wordlist = args.wordlist
                 Color.pl('{+} {C}option:{W} using wordlist {G}%s{W} to crack WPA handshakes' % args.wordlist)
             else:
-                Color.pl('{+} {C}option:{O} wordlist {R}%s{O} was not found, using {R}%s{W}' % (args.wordlist, Configuration.wordlist))
+                Configuration.wordlist = None
+                Color.pl('{+} {C}option:{O} wordlist {R}%s{O} was not found, wifite will NOT attempt to crack handshakes' % args.wordlist)
         if args.wpa_deauth_timeout:
             Configuration.wpa_deauth_timeout = args.wpa_deauth_timeout
             Color.pl('{+} {C}option:{W} will deauth WPA clients every {G}%d seconds{W}' % args.wpa_deauth_timeout)