Fixing stuff concerning throw/catch