Move catching block to encompass relation part as well.