diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.20.ebuild
similarity index 100%
rename from app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild
rename to app-eselect/eselect-metasploit/eselect-metasploit-0.20.ebuild
diff --git a/app-eselect/eselect-metasploit/files/msfloader-0.19 b/app-eselect/eselect-metasploit/files/msfloader-0.20
similarity index 89%
rename from app-eselect/eselect-metasploit/files/msfloader-0.19
rename to app-eselect/eselect-metasploit/files/msfloader-0.20
index 1c3968155..893678e88 100644
--- a/app-eselect/eselect-metasploit/files/msfloader-0.19
+++ b/app-eselect/eselect-metasploit/files/msfloader-0.20
@@ -7,6 +7,11 @@
 header="$(head -n1 /usr/lib/metasploit/msfconsole)"
 ruby="${header:2}"
 
+if [ -z "${MSF_LOCAL_LIB}" ] || [ -z "${MSF_DATABASE_CONFIG}" ] || [ -z "${MSF_ROOT}" ]; then
+  printf "Metasploit environmental variables aren't set.\n"
+  printf "Did you forget to '. /etc/profile'?\n"
+fi
+
 if [ -f "/usr/lib/metasploit/Gemfile.lock" ]; then
   GEMFILE=/usr/lib/metasploit/Gemfile
   #printf "Checking for known vulnerabilities...\n"