Make errors better

Also don't push intentional errors?