Trying to workaround potential null pointer problem