Fix duplicate raise code

[M-Yamashita01]

We found the duplicate raise codes.
Looking at the git history, the last modification to these codes was this PR #804 .
Therefore, we decided it would be better to use the second raise code and remove the first raise code.

Checklist

• Feature branch is up-to-date with master (if not - rebase it).
• Added tests.
• Added an entry to the Changelog if the new
  code introduces user-observable changes.
• Update Readme.md when cli options are changed

[grosser]

hehe good find!