Fix issue with blank 'message' field