fix log msg
try to connect if needed
Merge branch 'master' into portable