FIX: Fail gracefully when a property already exists