extra exception handling

Actually tested it this time. :)