yon
committed
on 22 May 02
adding a safety check