Fix: Catch NOT_CONNECTED error