Return to charger more gracefully