Added check for DAOProperties to not set DAO to null values.