add support for handler without payload. More testing