Adding try/catch to handle changes that are already in develop.

Re #6630.