Moar error entities!

nit, combine this + 118