diff --git a/WatcherAgent/src/main.rs b/WatcherAgent/src/main.rs
index 58d08d9..523ff8c 100644
--- a/WatcherAgent/src/main.rs
+++ b/WatcherAgent/src/main.rs
@@ -35,7 +35,11 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     // Get current image version
     let client_version = match get_current_image(&docker).await {
-        Ok(version) => version.unwrap(),
+        Ok(Some(version)) => version,
+        Ok(None) => {
+            eprintln!("Warning: No image version found");
+            "unknown".to_string()
+        }
         Err(e) => {
             eprintln!("Warning: Could not get current image version: {}", e);
             "unknown".to_string()