changed error/disconnect behaviour