Further changes for #79 - returning/cleanup of bad connection