quick fix on null pointer