Added new unclean connection stuff.