DF Fixed NPE.