[ros-diffs] [CVS reactos] add some error checking