Slightly more robust argv[1] handling