issue: 359697 increase code coverage (exclude more error flows)

Change-Id: Idaaf41ff72bc638e03d53d31688ad3d3caa0930f