(#1707) - Add some error handling to changes