Avoid NullPointerException reported via Google Play