Update for test on NullPointer messages