fixing potential NPE