#488 Some refactotings, Addid exceptions