Avoid NullPointerException (reported via Play Store)
Merge branch 'master' into issue362