PLA-984/PLA-985 Removed exception