diff --git a/src/alias/AliasDirectory.java b/src/alias/AliasDirectory.java
index b1bf7e95..0e6003ec 100644
--- a/src/alias/AliasDirectory.java
+++ b/src/alias/AliasDirectory.java
@@ -50,6 +50,11 @@ public class AliasDirectory
 	public void setAliasList( ArrayList<AliasList> lists )
 	{
 		mAliasList = lists;
+		
+		if( mAliasList == null )
+		{
+			mAliasList = new ArrayList<AliasList>();
+		}
 	}
 	
 	public void addAliasList( AliasList list )