Generalize SafeResult to include the model

Much more modular this way!