Fixed KeyErrors in case VlanManager is not used

Change-Id: I3d869b6c476ffa0ec1c0e7a6c8c210d49bc3b528
Merge "Fixed KeyErrors in case VlanManager is not used"