Add shell null to else block

MinGW-W64-builds-4.2.0 shell doesn't like the empty else blocks.
Merge pull request #3752

5d5b0d2 Add shell null to else block (Wil Bown)