Merge "Catch null return in doQuery()" into jb-ub-mail