Trying to fix NPE.