Fix for null pointer exceptions related to issues #233 and #237
Merge pull request #240 from wordpress-mobile/issue-233-237

Fix for null pointer exceptions related to issues #233 and #237