Fixed raised Exception types