Refs #10061 improved error handling