Bugfix weird folders

I don't think this if block is necessary.  We should be logging the error even if e.errno == 21, which would make both branches of the conditional behave identically.   At that point, that also makes the handling of OSError and Exception the same as well, which would mean we can/should condense those code blocks too.