make sure we don't go out of bounds
Merge remote-tracking branch 'origin/tim/File-Windows-backslash-handling' into tim/File-Windows-backslash-handling