diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index 8f0b61e..13f087e 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -9,9 +9,9 @@ set +e
 PIP_STATUS="${PIPESTATUS[0]}"
 set -e
 
+show-warnings
+
 if [[ ! $PIP_STATUS -eq 0 ]]; then
-    echo
-    show-warnings
     exit 1
 fi
 
diff --git a/bin/steps/python b/bin/steps/python
index 71aa111..caf4b5a 100755
--- a/bin/steps/python
+++ b/bin/steps/python
@@ -5,7 +5,7 @@ PYTHON_VERSION=$(cat runtime.txt)
 if [ -f .heroku/python-version ]; then
   if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
     bpwatch start uninstall_python
-      puts-step "Found runtime $(cat .heroku/python-version), removing"
+      puts-step "Found $(cat .heroku/python-version), removing"
       rm -fr .heroku/python
     bpwatch stop uninstall_python
   else
@@ -23,7 +23,7 @@ fi
 
 if [ ! "$SKIP_INSTALL" ]; then
   bpwatch start install_python
-    puts-step "Installing runtime ($PYTHON_VERSION)"
+    puts-step "Installing $PYTHON_VERSION"
 
     # Prepare destination directory.
     mkdir -p .heroku/python