2010-10-18 paulwerelds Fixed the NullReference Exception