Moar exception fixing.