Conditionalize the save (from fetch_or_create removal)