Fixed AttributeError: 'NoneType' object has no attribute 'populate'

Hit this after 051a4da16637f1ab184b8c7a3b41b330851906ef. Is a test required?