Fixed null result from handler