onErr cleaned up