Refs #9473 Improve error handling