diff --git a/lib/deliver/itunes_transporter.rb b/lib/deliver/itunes_transporter.rb
index <HASH>..<HASH> 100644
--- a/lib/deliver/itunes_transporter.rb
+++ b/lib/deliver/itunes_transporter.rb
@@ -54,7 +54,10 @@ module Deliver
       if result and File.directory?itmsp_path
         Helper.log.info "Successfully downloaded the latest package from iTunesConnect.".green
       else
-        Helper.log.fatal "Could not download metadata from iTunes Connect. Do you have special characters in your password (Like ' or \")?"
+        unless /^[0-9a-zA-Z\.\$\_]*$/ === @password
+          Helper.log.fatal "Password contains special characters, which may not be handled properly by iTMSTransporter. If you experience problems uploading to iTunes Connect, please consider changing your password to something with only alphanumeric characters.".red
+        end
+        Helper.log.fatal "Could not download metadata from iTunes Connect! It's probably related to your password or your internet connection."
       end
 
       result
Added warning and more information if password contains special characters

Fixes <URL>