Linux - fix mount.py to be more robust