Fix the null issue with "Welcome to Dirty Unicorns"

Change-Id: Ic31d33dba9b93db32c75f4c16c6483761b3be9dc