Few bugs fixed.
Client exception fix