Fixing flow of exceptions back to the shell