Fix [CatchFail] situation

Test: unit tests
Bug: 148418189
Change-Id: I600e95f0d7ec9c59dc92055716d4eb36d79f83a6
3 files changed