Carrier ait

Some cleanup and raising specific errors