updates for errorMessage rename and cleanup