Patch to fix issue with trying to add region names to enclosing declaration which is null