Handle RPC timeout's appropriately in the API

Change-Id: I178912ddf5e2dde45bc68b5dc14a8fd17f455ad2