[TASK] Minor error cleanup