added fallback for no connection