[PATCH] Consolidate the error handling