Fix NPE caused by missing TypeHandler

Signed-off-by: Ted Shaw <xiao.xj@gmail.com>