Index: Core/Common/src/Core.Common.Util/Enums/EnumDisplayNameHelper.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Core/Common/src/Core.Common.Util/Enums/EnumDisplayNameHelper.cs	(.../EnumDisplayNameHelper.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Core/Common/src/Core.Common.Util/Enums/EnumDisplayNameHelper.cs	(.../EnumDisplayNameHelper.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -38,7 +38,7 @@
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="value"/> is an
         /// invalid <typeparamref name="TEnum"/>.</exception>
         public static string GetDisplayName<TEnum>(TEnum value)
-            where TEnum : struct
+            where TEnum : Enum
         {
             if (!Enum.IsDefined(typeof(TEnum), value))
             {
Index: Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapper.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapper.cs	(.../EnumDisplayWrapper.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapper.cs	(.../EnumDisplayWrapper.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -21,7 +21,6 @@
 
 using System;
 using Core.Common.Util.Attributes;
-using Core.Common.Util.Exceptions;
 
 namespace Core.Common.Util.Enums
 {
@@ -30,28 +29,14 @@
     /// obtained for that value.
     /// </summary>
     /// <typeparam name="T">The enum type to wrap.</typeparam>
-    public class EnumDisplayWrapper<T>
+    public class EnumDisplayWrapper<T> where T : Enum
     {
         /// <summary>
         /// Creates a new instance of <see cref="EnumDisplayWrapper{T}"/>.
         /// </summary>
         /// <param name="value">The enum value to wrap.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/>
-        /// is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="value"/>
-        /// is not an Enum type.</exception>
         public EnumDisplayWrapper(T value)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value), @"An Enum type value is required.");
-            }
-
-            if (!typeof(Enum).IsAssignableFrom(typeof(T)))
-            {
-                throw new InvalidTypeParameterException(@"The type parameter has to be an Enum type.", nameof(T));
-            }
-
             Value = value;
             SetDisplayName(value);
         }
Index: Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapperHelper.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapperHelper.cs	(.../EnumDisplayWrapperHelper.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Core/Common/src/Core.Common.Util/Enums/EnumDisplayWrapperHelper.cs	(.../EnumDisplayWrapperHelper.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -34,7 +34,7 @@
         /// </summary>
         /// <typeparam name="T">The type of enum.</typeparam>
         /// <returns>A collection of <see cref="EnumDisplayWrapper{T}"/>.</returns>
-        public static EnumDisplayWrapper<T>[] GetEnumTypes<T>()
+        public static EnumDisplayWrapper<T>[] GetEnumTypes<T>() where T : Enum
         {
             return Enum.GetValues(typeof(T))
                        .OfType<T>()
Index: Core/Common/test/Core.Common.Util.Test/Enums/EnumDisplayWrapperTest.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Core/Common/test/Core.Common.Util.Test/Enums/EnumDisplayWrapperTest.cs	(.../EnumDisplayWrapperTest.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Core/Common/test/Core.Common.Util.Test/Enums/EnumDisplayWrapperTest.cs	(.../EnumDisplayWrapperTest.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -19,10 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.TestUtil;
 using Core.Common.Util.Enums;
-using Core.Common.Util.Exceptions;
 using NUnit.Framework;
 
 namespace Core.Common.Util.Test.Enums
@@ -31,28 +29,6 @@
     public class EnumDisplayWrapperTest
     {
         [Test]
-        public void Constructor_WithoutValue_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => new EnumDisplayWrapper<object>(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("value", exception.ParamName);
-        }
-
-        [Test]
-        public void Constructor_WithTypeParameterNotOfEnumType_ThrowsArgumentException()
-        {
-            // Call
-            void Call() => new EnumDisplayWrapper<object>(TestEnum.DisplayName);
-
-            // Assert
-            var exception = Assert.Throws<InvalidTypeParameterException>(Call);
-            Assert.AreEqual("T", exception.TypeParamName);
-        }
-
-        [Test]
         public void DisplayName_ConstructedWithEnumTypeValueWithoutResourceDisplayNameAttribute_EqualsToDefaultStringRepresentation()
         {
             // Setup
Index: Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -92,6 +92,7 @@
         /// <typeparam name="T">The initial failure mechanism result type enum.</typeparam>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static void AddInitialFailureMechanismResultTypeColumn<T>(DataGridViewControl dataGridViewControl, string dataPropertyName)
+            where T : Enum
         {
             if (dataGridViewControl == null)
             {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r47c62cc3539e2e426a79064a1b772e365ab4b626
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs	(.../FailureMechanismSectionResultViewColumnBuilderTest.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs	(.../FailureMechanismSectionResultViewColumnBuilderTest.cs)	(revision 47c62cc3539e2e426a79064a1b772e365ab4b626)
@@ -142,10 +142,12 @@
         /// </summary>
         /// <param name="expected">The expected object.</param>
         /// <param name="actual">The actual object.</param>
+        /// <typeparam name="T">The type of enum.</typeparam>
         /// <exception cref="AssertionException">Thrown when <paramref name="expected"/> and
         /// <paramref name="actual"/> are not equal.</exception>
         private static void AssertEnumDisplayWrappersAreEqual<T>(IEnumerable<EnumDisplayWrapper<T>> expected,
                                                                  IEnumerable<EnumDisplayWrapper<T>> actual)
+            where T : Enum
         {
             Assert.AreEqual(expected.Count(), actual.Count());
             for (var i = 0; i < expected.Count(); i++)