Minor handling improvement.