Merge "Sonar Minor: Remove the thrown runtime exception."