Avoid NullPointerException (reported via Play Store)
Fix NullPointerException