Added a few checks in the report too.