Added fix for exception handling