Moar error entities!

Sure, refactoring gone wild.