From 29090f41a015545252b01b5726618a8e4037f463 Mon Sep 17 00:00:00 2001
From: "grzegorz.russek" <grzegorz.russek@4fcca04b-e380-4062-a974-89054f7ae9f5>
Date: Fri, 9 May 2014 09:53:31 +0000
Subject: [PATCH] Fixed schema buildng

---
 DynamORM/DynamicDatabase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DynamORM/DynamicDatabase.cs b/DynamORM/DynamicDatabase.cs
index f9e9cda..f31632c 100644
--- a/DynamORM/DynamicDatabase.cs
+++ b/DynamORM/DynamicDatabase.cs
@@ -969,7 +969,7 @@ namespace DynamORM
             #region Type schema
 
             if ((mapperSchema && !Schema.ContainsKey(mapper.Type.FullName)) ||
-                (schema == null && !mapper.Type.IsAnonymous()))
+                (schema == null && mapper != null && !mapper.Type.IsAnonymous()))
             {
                 // TODO: Ged rid of this monster below...
                 if (databaseSchemaSupport)
@@ -1018,7 +1018,7 @@ namespace DynamORM
                         {
                             Name = DynamicExtensions.Coalesce<string>(v.Value.Column == null || string.IsNullOrEmpty(v.Value.Column.Name) ? null : v.Value.Column.Name, v.Value.Name),
                             IsKey = DynamicExtensions.CoalesceNullable<bool>(v.Value.Column != null ? v.Value.Column.IsKey : false, false).Value,
-                            Type = DynamicExtensions.CoalesceNullable<DbType>(v.Value.Column != null ? v.Value.Column.Type : null, DynamicExtensions.TypeMap.TryGetNullable(v.Value.Type)).Value,
+                            Type = DynamicExtensions.CoalesceNullable<DbType>(v.Value.Column != null ? v.Value.Column.Type : null, DynamicExtensions.TypeMap.TryGetNullable(v.Value.Type) ?? DbType.String).Value,
                             IsUnique = DynamicExtensions.CoalesceNullable<bool>(v.Value.Column != null ? v.Value.Column.IsUnique : null, false).Value,
                             Size = DynamicExtensions.CoalesceNullable<int>(v.Value.Column != null ? v.Value.Column.Size : null, 0).Value,
                             Precision = DynamicExtensions.CoalesceNullable<byte>(v.Value.Column != null ? v.Value.Column.Precision : null, 0).Value,