added some more no connection handling