catch by reference

Change-Id: Ib1f04971dc89df6df09bd12595d3ddb148715e28