NPE caused by fix earlier... oops.