Update to handle cases where fewer messages are receieved than requested

Signed-off-by: Rick Copeland <rick@synapp.io>