Tweak error messages
Pls threads. Stop leaking.
Merge remote-tracking branch 'origin/unstable' into unstable
Merge branch 'master' into unstable
Fixed messages