diff --git a/gaboshlib/g_runcmd.bashfunc b/gaboshlib/g_runcmd.bashfunc
index 6479f1e..10a6310 100644
--- a/gaboshlib/g_runcmd.bashfunc
+++ b/gaboshlib/g_runcmd.bashfunc
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 function g_runcmd {
+  set -o pipefail
   g_echo "running $@"
-  $@ 2>&1 | tee $g_tmp/g_runcmd-output  
+  $@ 2>&1 | tee $g_tmp/g_runcmd-output
   g_runcmd_exitcode=$?
 
-  if [ $g_runcmd_exitcode -eq 0 ]
+  if ! [ $g_runcmd_exitcode -eq 0 ]
   then
-    g_echo_ok "$@"
-  else
-    g_echo_error "$@" 
+    g_echo_error "# $@
+$(cat $g_tmp/g_runcmd-output)"
   fi
   return $g_runcmd_exitcode
 }