Unified place for exceptions + started to getting rid of exception masking