From 88cd76667de17ecd0d176cd894921345ba5e47f8 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Fri, 27 May 2022 01:38:28 +0100
Subject: [PATCH] Data types are null when being created, defend legacy value
 converter from nulls

---
 CHANGELOG.md                                               | 7 ++++++-
 .../Migrations/LegacyMigrationComponent.cs                 | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5709fbc..7c1c5b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [2.0.3] - 2022-05-27
+### Fixed
+* Unable to create new Meganav properties due to null data type
+
 ## [2.0.2] - 2022-05-23
 ### Fixed
 * `meganav-card` styles breaking backoffice minification
@@ -58,7 +62,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/) and this
 ### Added
 * Initial release of Meganav for Umbraco 7.5
 
-[Unreleased]: https://github.com/callumbwhyte/meganav/compare/release-2.0.2...HEAD
+[Unreleased]: https://github.com/callumbwhyte/meganav/compare/release-2.0.3...HEAD
+[2.0.3]: https://github.com/callumbwhyte/meganav/compare/release-2.0.2...release-2.0.3
 [2.0.2]: https://github.com/callumbwhyte/meganav/compare/release-2.0.1...release-2.0.2
 [2.0.1]: https://github.com/callumbwhyte/meganav/compare/release-2.0.0...release-2.0.1
 [2.0.0]: https://github.com/callumbwhyte/meganav/tree/release-2.0.0
diff --git a/src/Our.Umbraco.Meganav/Migrations/LegacyMigrationComponent.cs b/src/Our.Umbraco.Meganav/Migrations/LegacyMigrationComponent.cs
index 0e37407..3ae2dc4 100644
--- a/src/Our.Umbraco.Meganav/Migrations/LegacyMigrationComponent.cs
+++ b/src/Our.Umbraco.Meganav/Migrations/LegacyMigrationComponent.cs
@@ -35,7 +35,9 @@ private void DataTypeService_Saving(IDataTypeService sender, SaveEventArgs<IData
                 {
                     var existingEntity = sender.GetDataType(x.Id);
 
-                    return existingEntity?.EditorAlias != Constants.PropertyEditorAlias && LegacyEditors.Aliases.Any(existingEntity.EditorAlias.InvariantContains);
+                    return existingEntity != null
+                        && existingEntity.EditorAlias != Constants.PropertyEditorAlias
+                        && LegacyEditors.Aliases.Any(existingEntity.EditorAlias.InvariantContains);
                 });
 
             foreach (var dataType in dataTypes)