Proper cleanup of Tunnel and LPA during Error

 - Cleanup of tunnel and lpa during error

Change-Id: I8792c224e55ec96102a00bd38ed4d8de85fd7e4e