Better error messaging, restoring adapter