From c843f15d424b730c970e0a07138d205e67460ed2 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 12 May 2013 22:13:05 +0200
Subject: [PATCH] Merged the dev branch (many-chars-per-player) and made some
 more error checking in the migrations.

---
 src/objects/migrations/0019_convert_attrdata.py | 3 ++-
 src/typeclasses/models.py                       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/objects/migrations/0019_convert_attrdata.py b/src/objects/migrations/0019_convert_attrdata.py
index bffb735f4a..eebe9117f2 100644
--- a/src/objects/migrations/0019_convert_attrdata.py
+++ b/src/objects/migrations/0019_convert_attrdata.py
@@ -366,12 +366,13 @@ class Migration(DataMigration):
                 mclass = CTYPEGET(model=data.db_model).model_class()
                 try:
                     return mclass.objects.get(id=data.id)
-
                 except AttributeError:
                     try:
                         return mclass.objects.get(id=data.id)
                     except mclass.DoesNotExist: # could happen if object was deleted in the interim.
                         return None
+                except TypeError, e:
+                    print e
 
             def iter_id2db(item):
                 """
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index afea58464b..849251388b 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -681,6 +681,9 @@ class TypedObject(SharedMemoryModel):
                     _SA(self, "_cached_typeclass", typeclass)
                     try:
                         typeclass.at_init()
+                    except AttributeError:
+                        logger.log_trace("\n%s: Error initializing typeclass %s. Using default." % (self, tpath))
+                        break
                     except Exception:
                         logger.log_trace()
                     return typeclass