diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
index eb516e1..52d2c9b 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
@@ -29,7 +29,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (property == null || string.IsNullOrEmpty(property.Value.ToString()))
+            if (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()))
                 return default(T);
 
             return property.GetValue<T>();
@@ -43,7 +43,7 @@ namespace Archetype.Models
         public bool HasValue(string propertyAlias)
         {
             var property = GetProperty(propertyAlias);
-            if (property == null)
+            if (property == null || property.Value == null)
                 return false;
 
             return !string.IsNullOrEmpty(property.Value.ToString());
@@ -57,4 +57,4 @@ namespace Archetype.Models
         #endregion
 
     }
-}
+}
\ No newline at end of file