change exception stuff a bit