Fixed regression

Smell: these negative checks with rescues can hide errors