Added extra comments and exception handling

Now the exception handling looks nicer, but still exits.