Turned back on the server exit on transport fail. Few other changes.