More error checks in the daemon