add checks for data where they should have been