#47 Check handler
Additional logging
#53 Fix validation