Minor fixes to error handling post
Merge branch 'release/20130731-p2'