fixed some exception handling issues again