[CLEANUP] Error handling classes