Fix double-close for empty account