Fixed error handling logic, we want to return, not exit
Check 30 seconds for USB port
Better mount test, still not reproducing failure very well