Fix exceptions - probably doesn't actually work yet