--- a/xmpp/status.go Mon Sep 30 18:59:37 2013 -0600 +++ b/xmpp/status.go Mon Sep 30 20:31:25 2013 -0600 @@ -90,7 +90,7 @@ if current == waitFor { return nil } - if current == StatusShutdown { + if current.fatal() { break } if current > waitFor {