Better ExceptionHandling, some bugs fixxed.