fix #1367
Merge pull request #1424 from wordpress-mobile/issue/1367-post-upload-npe

fix #1367