Fix NRE and Head request returning data