Commit next part of FS# 10138 by Teruaki Kawashima. Removed unneeded error checks...