Add error handling to contributions

Change-Id: Ia7785a9248220d1f7a567d1f8cf77bc88ab2ef13
Merge "Add error handling to contributions"