Prepare for #4047, live-support for oc.uk
Fix new Findbugs warning