diff --git a/lib/core/common.py b/lib/core/common.py
index 60da41015..5707ea27a 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -91,6 +91,7 @@ from lib.core.settings import FORMATTER
 from lib.core.settings import NULL
 from lib.core.settings import HASHDB_MILESTONE_VALUE
 from lib.core.settings import IS_WIN
+from lib.core.settings import ISSUES_PAGE
 from lib.core.settings import PLATFORM
 from lib.core.settings import PYVERSION
 from lib.core.settings import VERSION
@@ -2485,7 +2486,7 @@ def unhandledExceptionMessage():
     errMsg = "unhandled exception in %s, retry your " % VERSION_STRING
     errMsg += "run with the latest development version from the Subversion "
     errMsg += "repository. If the exception persists, please send by e-mail "
-    errMsg += "to %s the following text " % ML
+    errMsg += "to '%s' or open a new issue at '%s' with the following text " % (ML, ISSUES_PAGE)
     errMsg += "and any information required to reproduce the bug. The "
     errMsg += "developers will try to reproduce the bug, fix it accordingly "
     errMsg += "and get back to you.\n"
diff --git a/lib/core/settings.py b/lib/core/settings.py
index a3fb359d5..3147e9560 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -23,6 +23,7 @@ REVISION = getRevisionNumber()
 VERSION_STRING = "sqlmap/%s%s" % (VERSION, "-%s" % REVISION if REVISION else "")
 DESCRIPTION = "automatic SQL injection and database takeover tool"
 SITE = "http://sqlmap.org"
+ISSUES_PAGE = "https://github.com/sqlmapproject/sqlmap/issues"
 ML = "sqlmap-users@lists.sourceforge.net"
 
 # minimum distance of ratio from kb.matchRatio to result in True
diff --git a/lib/core/update.py b/lib/core/update.py
index f41b9cdf3..2e8ba7ad3 100644
--- a/lib/core/update.py
+++ b/lib/core/update.py
@@ -56,7 +56,9 @@ def update():
         if IS_WIN:
             infoMsg = "for Windows platform it's recommended "
             infoMsg += "to use a GitHub for Windows client for updating "
-            infoMsg += "purposes (http://windows.github.com/)"
+            infoMsg += "purposes (http://windows.github.com/) or just "
+            infoMsg += "download the latest snapshot from "
+            infoMsg += "https://github.com/sqlmapproject/sqlmap/downloads"
         else:
             infoMsg = "for Linux platform it's required "
             infoMsg += "to install a standard 'git' package (e.g.: 'sudo apt-get install git')"
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 2432dd573..6484bf4f9 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -531,7 +531,7 @@ def cmdLineParser():
 
         general.add_option("--flush-session", dest="flushSession",
                             action="store_true",
-                            help="Flush session file for current target")
+                            help="Flush session files for current target")
 
         general.add_option("--forms", dest="forms",
                                   action="store_true",
diff --git a/sqlmap.conf b/sqlmap.conf
index 561bbbf69..558b08234 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -580,7 +580,7 @@ dCred =
 # Valid: True or False
 eta = False
 
-# Flush session file for current target.
+# Flush session files for current target.
 # Valid: True or False
 flushSession = False