Errors aren't exploding
Merged changes, but can't test