bug fixes around handler service.