Fixes 3

Exception catching started