Fix NPE in chooser on tablet
Merge pull request #154 from doopl/master

Fix NPE in chooser on tablet