Moar error entities!

Force-pushed a fix.