fix #1227
fix #1221
fix #1222
fix #1223
fix #1224
fix #1225
Merge pull request #1228 from wordpress-mobile/issue/1227-misc-npe

fix #1227 and other NPEs