diff --git a/apps/config/sql/commandalias.sql b/apps/config/sql/commandalias.sql
new file mode 100644
index 0000000000..778d307678
--- /dev/null
+++ b/apps/config/sql/commandalias.sql
@@ -0,0 +1,9 @@
+INSERT INTO "config_commandalias" VALUES(1,'l','look');
+INSERT INTO "config_commandalias" VALUES(2,'ex','examine');
+INSERT INTO "config_commandalias" VALUES(3,'@dest','@destroy');
+INSERT INTO "config_commandalias" VALUES(4,'@nuke','@destroy');
+INSERT INTO "config_commandalias" VALUES(5,'sa','say');
+INSERT INTO "config_commandalias" VALUES(6,'@tel','@teleport');
+INSERT INTO "config_commandalias" VALUES(7,'i','inventory');
+INSERT INTO "config_commandalias" VALUES(8,'inv','inventory');
+INSERT INTO "config_commandalias" VALUES(9,'@desc','@description');
\ No newline at end of file
diff --git a/apps/config/sql/configvalue.sql b/apps/config/sql/configvalue.sql
new file mode 100644
index 0000000000..449cf7808a
--- /dev/null
+++ b/apps/config/sql/configvalue.sql
@@ -0,0 +1,5 @@
+INSERT INTO "config_configvalue" VALUES(0,'site_name','Evennia Test Site');
+INSERT INTO "config_configvalue" VALUES(1,'site_port','4000');
+INSERT INTO "config_configvalue" VALUES(2,'player_dbnum_start','2');
+INSERT INTO "config_configvalue" VALUES(3,'money_name_plural','Credits');
+INSERT INTO "config_configvalue" VALUES(4,'money_name_singular','Credit');
\ No newline at end of file
diff --git a/apps/helpsys/sql/helpentry.sql b/apps/helpsys/sql/helpentry.sql
new file mode 100644
index 0000000000..95cbdcb991
--- /dev/null
+++ b/apps/helpsys/sql/helpentry.sql
@@ -0,0 +1,17 @@
+INSERT INTO "helpsys_helpentry" VALUES(1,'Help Index','This game has yet to customize its help index, so for now you may browse the generic codebase help files.
+
+Topics
+------
+NEWBIE %%t%%t Getting started (for new players).
+COMMANDS %%t How to get help with commands.
+CREDITS %%t Codebase credits.',0);
+INSERT INTO "helpsys_helpentry" VALUES(2,'Credits','Evennia is a product of a small community of developers, all working towards the continual improvement of the codebase. The following people have made major contributions with the end result being what you are now playing.
+
+"Kelvin" (Greg Taylor) - Lead developer and original author.',0);
+INSERT INTO "helpsys_helpentry" VALUES(3,'Commands','Commands in Evennia are generally organized into one of two categories: %%cgPublic%%cn or %%cyPrivileged%%cn commands.
+
+%%cgPublic%%cn commands are more or less available to everyone. None of these commands are prefixed with anything, they are typical, every-day commands like %%chlook%%cn, %%chsay%%cn, and %%chget%%cn.
+
+%%cyPrivileged%%cn command availability is largely dependent on the privileges and powers bestowed on you by the staff. Privileged commands are generally building/administration related and aren''t of general interest to players. These commands are all pre-fixed by a ''%%ch@%%cn'' character.
+
+To see a list of all commands, use %%ch@list commands%%cn. If you''d like to learn more about any individual command, you may do so by typing %%chhelp <topic>%%cn, where <topic> is the name of the command (without the <>''s).',0);
\ No newline at end of file
diff --git a/apps/objects/models.py b/apps/objects/models.py
index 4ddb6a9d93..b0c68a6e97 100755
--- a/apps/objects/models.py
+++ b/apps/objects/models.py
@@ -441,6 +441,7 @@ class Object(models.Model):
       try:
          return self.location
       except:
+         functions_general.print_errmsg("Object '%s(#%d)' has invalid location: #%s" % (self.name,self.id,self.location_id))
          return False
          
    def get_attribute_value(self, attrib, default=False):
diff --git a/apps/objects/sql/object.sql b/apps/objects/sql/object.sql
new file mode 100644
index 0000000000..7777743601
--- /dev/null
+++ b/apps/objects/sql/object.sql
@@ -0,0 +1,2 @@
+INSERT INTO "objects_object" VALUES(1,'Wizard','Wizard',1,0,2,1,'',2,'','CONNECTED','2007-04-25');
+INSERT INTO "objects_object" VALUES(2,'Limbo','Limbo',1,NULL,NULL,2,'Welcome to your new Evennia-based game. From here you are ready to begin development. If you should need help or would like to participate in community discussions, visit http://evennia.com.',NULL,'','','2007-04-25');
\ No newline at end of file
diff --git a/evennia.sql b/evennia.sql
index 600480cbbf..05cc0ab8e6 100755
Binary files a/evennia.sql and b/evennia.sql differ
diff --git a/functions_db.py b/functions_db.py
index 6d6bb44f75..ad704428e1 100644
--- a/functions_db.py
+++ b/functions_db.py
@@ -179,7 +179,10 @@ def create_object(odat):
          new_object.home = odat["location"]
          
    new_object.save()
-   new_object.move_to(odat['location'])
+
+   # Rooms have a NULL location.
+   if not new_object.is_room():
+      new_object.move_to(odat['location'])
    
    return new_object