Added handlerSize check