Make script more forgiving