The attached patch fixes two warnings (which have been treated as errors):
The first one is pretty simple (comparing/returning possible undefined variable).
The second one seems to be a check on the wrong variable.
Created attachment 10967 [details] [review]
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct.