diff --git a/bin/graceful_stop.sh b/bin/graceful_stop.sh
index fc18239830b2..ff8fac90b6f2 100755
--- a/bin/graceful_stop.sh
+++ b/bin/graceful_stop.sh
@@ -115,7 +115,7 @@ if [ "$nob" == "true"  ]; then
   HBASE_BALANCER_STATE=false
 else
   log "Disabling load balancer"
-  HBASE_BALANCER_STATE=$(echo 'balance_switch false' | "$bin"/hbase --config "${HBASE_CONF_DIR}" shell -n | tail -1)
+  HBASE_BALANCER_STATE=$(echo 'balance_switch false' | "$bin"/hbase --config "${HBASE_CONF_DIR}" shell -n | tail -2 | head -1)
   log "Previous balancer state was $HBASE_BALANCER_STATE"
 fi
 
diff --git a/hbase-shell/src/main/ruby/jar-bootstrap.rb b/hbase-shell/src/main/ruby/jar-bootstrap.rb
index 917817fc59f9..4ea6d6139d60 100644
--- a/hbase-shell/src/main/ruby/jar-bootstrap.rb
+++ b/hbase-shell/src/main/ruby/jar-bootstrap.rb
@@ -203,7 +203,9 @@ def debug?
 
 IRB.conf[:IRB_NAME] = 'hbase'
 IRB.conf[:AP_NAME] = 'hbase'
-IRB.conf[:PROMPT_MODE] = :CUSTOM
+if interactive
+  IRB.conf[:PROMPT_MODE] = :CUSTOM
+end
 IRB.conf[:BACK_TRACE_LIMIT] = 0 unless full_backtrace
 
 # Create a workspace we'll use across sessions.