Fix NPE in FFW