Fix handler package in double
Add NullValueInterceptor