diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems
index 8b6758a803..bbdf2c3a6e 100755
--- a/share/install_gems/install_gems
+++ b/share/install_gems/install_gems
@@ -165,7 +165,8 @@ def install_dependencies(gems, distro)
             documentation.
 
             Press enter to continue...
-    EOT
+        EOT
+        STDIN.readline
     else
         puts "Distribution \"#{distro.first}\" detected."
         deps=get_dependencies(gems, distro.last[:dependencies])
@@ -240,7 +241,7 @@ packages_string=gems_list.join(' ')
 
 prefix=""
 
-if dist.last[:gem_env]
+if dist && dist.last[:gem_env]
     prefix=dist.last[:gem_env].collect do |name, value|
         "#{name}=\"#{value}\""
     end.join(' ')+' '