Refactor - adding exception with Flash Message