fix bz1071473 

and msg fix for bz1071167

[merge]