BASE-12 - Add new Exception Classes