Fixed Nullpointer (added check)
Changed to production logo