Added error classes and fixes errors for now