did some bugfixes , added few Exception handlers