Switching back to built-in exception and cleaning up Boolean classes to use primitive