nasty NPE
Merge branch 'frostclick-search' of github.com:frostwire/frostwire-android into frostclick-search