Add null pointer check before accessing the intent's extras
Merge pull request #2 from twotoasters/james-dev

Add null pointer check before accessing the intent's extras