Slight changes to exception handling

Version Pre-Alpha 0.5.8