Add graceful working check