PLA-1579 removing unnecessery exception