Added better exception-handling