Possible fix for NPE crash

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>
Touchup for easter egg

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>