Fixed potential NPE.