diff --git a/tbsetup/libosload.pm.in b/tbsetup/libosload.pm.in
index 39103e5d1820309647b49cf3eeb86e5a4c7d06c4..dbaccca04d05d7ae59168d76e05fec365ad9c837 100755
--- a/tbsetup/libosload.pm.in
+++ b/tbsetup/libosload.pm.in
@@ -624,12 +624,16 @@ sub WaitTillReloadDone($$$@)
 	while ($count) {
 	    foreach my $node (@nodes) {
 		print STDERR "osload ($node): waiting for node to finish ".
-		    "booting";
+		    "booting\n";
 		if ($done{$node} < $waitmode) {
+		    my $actual_state;
+
 		    if (!TBNodeStateWait($node,
-					 TBDB_NODESTATE_ISUP,
 					 $startwait,
-					 (60*7))) {
+					 (60*6),
+					 \$actual_state,
+					 (TBDB_NODESTATE_TBFAILED,
+					  TBDB_NODESTATE_ISUP))) {
 			$count--;
 			$done{$node} = $waitmode;
 		    }