Much cleaner way of ensuring row is closed.