Fix weird looking error return
Take message pointers in handlers