Add more try/catch and exception-message stuff.