Cleaned up error stuff
o