adding bugfixes for exception handling