fixed WHOHandler (NULL + 1 can not be NULL ...)