Bug fixed and request exception handling was added