Bug 2137: Improve license check