Remove $config member from Container and re-scope
Changed null check