Better injection logging, validation