Adding error catching to stupid cache issue