Making JAVELINS safe