Adding some more test for null pointers.
Changing icons