More hardening against expected folders being files
More hardening against expected folders being files

See #1953

foosel/OctoPrint,JackGavin13/octoprint-test-not-finished,foosel/OctoPrint,Jaesin/OctoPrint,foosel/OctoPrint,foosel/OctoPrint,Salandora/OctoPrint,JackGavin13/octoprint-test-not-finished,JackGavin13/octoprint-test-not-finished,Jaesin/OctoPrint,Salandora/OctoPrint,Salandora/OctoPrint,JackGavin13/octoprint-test-not-finished,Jaesin/OctoPrint,Salandora/OctoPrint,Jaesin/OctoPrint