🐛 Avoid potential null operations when saving the entity

🐛 Avoid potential null operations when saving the entity #342