Fix other NPE