minor fixes for conditions where there was no data, don't error but fail
gracefully