Added status check for client