Fix save error causing modal to break (#790)