LPS-33028 Make catch more generic in upgrade process instead