Refs #9077 Refactored save check code

Some of the save check code has now been refeactored into a separate method. One check messages couldn't be refactored as it's asking a different question.