Fix NPE, handle HttpMessageNotReadableException for empty results