Add a nil friendly marshaller to make the whole marshal experience more forgiving