From 8dda6ec87b911dbdab74eacc1a52aa34decdaf40 Mon Sep 17 00:00:00 2001
From: Corey Oordt <coreyoordt@gmail.com>
Date: Wed, 13 May 2015 15:24:41 -0500
Subject: [PATCH] Fixed a potential issue with double-loading of the dev server

---
 categories/registration.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/categories/registration.py b/categories/registration.py
index 1088817..a21408b 100644
--- a/categories/registration.py
+++ b/categories/registration.py
@@ -60,11 +60,16 @@ class Registry(object):
             field_definitions = [field_definitions]
 
         for fld in field_definitions:
-            extra_params = {'to': 'categories.Category', 'null': True, 'blank': True}
+            extra_params = {'to': 'categories.Category', 'blank': True}
+            if field_type != 'ManyToManyField':
+                extra_params['null'] = True
             if isinstance(fld, basestring):
                 field_name = fld
             elif isinstance(fld, dict):
-                field_name = fld.pop('name')
+                if 'name' in fld:
+                    field_name = fld.pop('name')
+                else:
+                    continue
                 extra_params.update(fld)
             else:
                 raise ImproperlyConfigured(_("%(settings)s doesn't recognize the "