tidy up, catch None in ports