PIM-3048: Change exception thrown