Topic/plat 6692

Should probably throw an UnsupportedOperationException (and other nulls)