Handle issue closing a little more nicely