PLA-1249 Fixed exception throw