Fixed leaking text in error case
Merge branch 'master' into HEAD