diff --git a/python/build/pycharm.sh b/python/build/pycharm.sh
index 6bb44ae309d1..2fc89eb24284 100644
--- a/python/build/pycharm.sh
+++ b/python/build/pycharm.sh
@@ -26,7 +26,11 @@ if [ -z "$PYCHARM_JDK" ]; then
   fi
   if [ -z "$PYCHARM_JDK" ]; then
     echo ERROR: cannot start PyCharm.
-    echo No JDK found to run PyCharm. Please validate either PYCHARM_JDK or JDK_HOME points to valid JDK installation
+    echo No JDK found to run PyCharm. Please validate either PYCHARM_JDK, JDK_HOME or JAVA_HOME points to valid JDK installation.
+    echo
+    echo Press Enter to continue.
+    read IGNORE
+    exit 1
   fi
 fi
 
@@ -36,7 +40,7 @@ grep 'OpenJDK' $VERSION_LOG
 OPEN_JDK=$?
 grep '64-Bit' $VERSION_LOG
 BITS=$?
-rm /tmp/java.version.log
+rm $VERSION_LOG
 if [ $OPEN_JDK -eq 0 ]; then
   echo WARNING: You are launching IDE using OpenJDK Java runtime
   echo