I have just improved exception handling mechanism.