added no connection handling