Minor fix for memory leak fix (always give a connection & always
close it)