Recipe tidy up and new exception