Bugfix release
server no longer drops when admin or client times out