Fix an NPE + change pathid