better handling when 'null' passed to methods expecting delegates
deprecate old container