Make change to Model code failsafe