Better error handling. Adding license.