Fixed some issues with Exceptions