fixed exception handling for ms handler, added packages to cover