Replace assertions with real error checks
2 files changed