Fix --no-update-check causing an exception during shutdown