PLA-1305 as jj requested, more exceptions