More error handling, fixed defect within data controller