Extra catch, removing for now. Will add back in later.