Resolved issue with No Data Exceptions