New license model and better error checking