more catch by reference

Change-Id: I2db9f94a517f814ef0854190e6f1194501070409