By rblanker: Some style clean up of code & introducing own connector exception class.