Fixed notices in handlers.