Fix a NPE
Allow installation on external storage