The cleanup tag is not required, so it needs to check null pointer
exception.
Fixed BufferUnderflow Exception