diff --git a/extensions-builtin/a1111-sd-webui-lycoris b/extensions-builtin/a1111-sd-webui-lycoris
index f39bc5598..95149e407 160000
--- a/extensions-builtin/a1111-sd-webui-lycoris
+++ b/extensions-builtin/a1111-sd-webui-lycoris
@@ -1 +1 @@
-Subproject commit f39bc5598b3469aa8a3c757a47b28ee205b0e947
+Subproject commit 95149e407357a667e5fbd5ecf9dae9adae6f36b8
diff --git a/modules/images.py b/modules/images.py
index ca5b33d13..a137e73dc 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -338,6 +338,7 @@ class FilenameGenerator:
         'sampler': lambda self: self.p and sanitize_filename_part(self.p.sampler_name, replace_spaces=False),
         'model_hash': lambda self: getattr(self.p, "sd_model_hash", shared.sd_model.sd_model_hash),
         'model_name': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.model_name, replace_spaces=False),
+        'model_shortname': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.name_for_extra, replace_spaces=False),
         'date': lambda self: datetime.datetime.now().strftime('%Y-%m-%d'),
         'datetime': lambda self, *args: self.datetime(*args),  # accepts formats: [datetime], [datetime<Format>], [datetime<Format><Time Zone>]
         'job_timestamp': lambda self: getattr(self.p, "job_timestamp", shared.state.job_timestamp),
diff --git a/setup.py b/setup.py
index 66e286238..b2e5f7441 100644
--- a/setup.py
+++ b/setup.py
@@ -200,15 +200,16 @@ def check_torch():
             log.warning("Torch repoorts CUDA not available")
         else:
             if torch.version.cuda:
-                log.info(f'Torch backend: nVidia CUDA {torch.version.cuda} cuDNN {torch.backends.cudnn.version()}')
+                log.info(f'Torch backend: nVidia CUDA {torch.version.cuda} cuDNN {torch.backends.cudnn.version() if torch.backends.cudnn.is_available() else "N/A"}')
             elif torch.version.hip:
                 log.info(f'Torch backend: AMD ROCm HIP {torch.version.hip}')
             else:
                 log.warning('Unknown Torch backend')
             for device in [torch.cuda.device(i) for i in range(torch.cuda.device_count())]:
                 log.info(f'Torch detected GPU: {torch.cuda.get_device_name(device)} VRAM {round(torch.cuda.get_device_properties(device).total_memory / 1024 / 1024)} Arch {torch.cuda.get_device_capability(device)} Cores {torch.cuda.get_device_properties(device).multi_processor_count}')
-    except:
-        pass
+    except Exception as e:
+        log.error(f'Could not load torch: {e}')
+        exit(1)
     try:
         if 'xformers' in xformers_package:
             install(f'--no-deps {xformers_package}', ignore=True)