LPS-40421

Hey Brian, Please see the commit message for explanation. Also I've checked and we have a lot of different patterns in our exceptions. Do you think we should consolidate and regulate those? Do you have a pattern in mind? Thanks, Zs.