Ix 9.17.0 plat 1345

@hilak, why do you throw an exception instead of using the default?