Fix potential NullPointer