Robust-ify a bit

minor updates so that weird cases don't cause the pipeline to halt execution