Remove potential division by 0 and add more error checking to hll_athena.