READ(E) and locked records

I've just been caught out by something that should have been obvious but
we missed.  I wondered what the best way to deal with it was

With READ and an indicator, if the record happened to be locked the user
got an error message that was ugly but allowed a retry.  It happened so
infrequently and recovery was so painless that we just accepted it.

We've recently switched to using READ(E) and %EoF etc, using code
similar to:

Read(E) File
Dow             Not %EoF
... Some stuff here
Update  File
Read(E) File
EndDo

but now we don't get the error message if there's a lock, and we fall
through the DoW loop ending up with an update without prior read or
chain.

We could code DoW not %EoF and not %Error, but that's hiding the
problem.  I'd like to be able to give the user the option to retry.

What does everyone else do?  INFDS, register an error handler?

Cheers
Rob