[CLEANUP] Polish Enumeration exceptions