Guard pulling of onSaveCallback