Fix error message

@charlierudolph we are now merging the main branch into the feature branch