Fix places where the errno value was being overwritten by subsequent actions...

Fix places where the errno value was being overwritten by subsequent actions so that the returned errno value was incorrect.  From Max Neklyudov.