Merge "sonar: use dedicated exception instead of RuntimeException"