add zero length check

Signed-off-by: Mattias Andrée <maandree@operamail.com>
fix some client marshalling errors

Signed-off-by: Mattias Andrée <maandree@operamail.com>