Added NullHandler for 2.6.