Patch for client-field bug. But still some errormessages.