1006 Added extra guards against NPE
Merge branch 'dev' of https://github.com/garvankeeley/MozStumbler into 1006-npe
Merge pull request #1007 from garvankeeley/1006-npe

1006 Added extra guards against NPE