fix null pointer exception when using the back button
Merge branch 'master' of github.com:mripley/Marbol