GUi-1340
convert error handling to common handler throughout