Fixed a bug in deriving Switch Mac-address and a null check on set payload on ip...