Improve error handling and fix URL handing to pass the certification suite; delint.