Handle single message

Signed-off-by: Tom Castleman <tom.castleman@b3-it.com>