More fixes for more data

Fix some other places where we would backtrace if there was no data.