Made data controller more error resistant