fix for 2 null pointer related bugs and 1 bitmap related bug
Merge pull request #3 from rockycamacho/master

fix for 2 null pointer related bugs and 1 bitmap related bug