Remove redundant compiler properties
Restore exception handling