Connect Lib: Fix NPE when no payload is present