Add error checking & reporting on client