BugFix: Ensure properties are set before updating in database