disconnect no longer logs error
Merge branch 'disconnect'
fixed error related to disconnection