diff --git a/ocarina/body/image.py b/ocarina/body/image.py
index 15ee8255..90b14a90 100644
--- a/ocarina/body/image.py
+++ b/ocarina/body/image.py
@@ -45,7 +45,7 @@ class FileImage(gtk.Image):
 		return self.path
 
 	def set_image(self, path, height):
-		if path != None:
+		if path != self.path:
 			self.path   = path
 			self.height = height
 			gtk.threads_enter()
@@ -54,8 +54,6 @@ class FileImage(gtk.Image):
 			gtk.threads_leave()
 
 	def tooltip(self, image, x, y, keyboard, tip):
-		if self.path == None:
-			return
 		image = gtk.Image()
 		image.set_from_file(self.path)
 		tip.set_icon(image.get_pixbuf())