Move some exceptions to customer pkg