Simplified error handling for dynamic graph re-rendering

Change-Id: I32ec8347e8c4f04a589d5215d624bec24f21563d