Fix potential null pointer dereference

[szsam]

Move dereference of message_with_callback inside the if block that checks the pointer is non-null.

[ewertons]

Excellent, @szsam , thank you for updating the branch!