Only exception handling left

Only finishing touches on the exception handling left.