Fix spurious null from getDelegate()