Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -1811,25 +1811,22 @@
 	   (> (length res) 2))
       res)
      ((eq? res #f)   default) ;; add messages?
      ((eq? res #f) default)   ;; this would be the #eof
      (else default))))
+
+(define (common:ssh-get-loadavg remote-host)
+  (let ((inp (open-input-pipe (conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\""))))
+      (let* ((res (read-lines inp)))
+	(close-input-pipe inp)
+	res)))
 
 (define (common:get-normalized-cpu-load-raw remote-host)
   (let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost
     (or (common:get-cached-info actual-host "normalized-load")
 	(let ((data (if remote-host
-			(let ((inp #f))
-			  (handle-exceptions
-			      exn
-			    (begin
-			      (close-input-port inp)
-			      '())
-			    (set! inp (open-input-port (conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\"")))
-			    (let* ((res (read-lines inp)))
-			      (close-input-port inp)
-			      res)))
+			(common:ssh-get-loadavg remote-host)
 			(append 
 			 (with-input-from-file "/proc/loadavg" 
 			   read-lines)
 			 (with-input-from-file "/proc/cpuinfo"
 			   read-lines)