diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py
index eb91cfdd..67ed6514 100644
--- a/pisi/actionsapi/get.py
+++ b/pisi/actionsapi/get.py
@@ -136,15 +136,12 @@ def defaultprefixDIR():
     return dirs.defaultprefix
 
 def kdeDIR():
-    # FIXME: Get followings from env.d or somewhere else
     return dirs.kde
 
 def qtDIR():
-    # FIXME: Get followings from env.d or somewhere else
     return dirs.qt
 
 def qtLIBDIR():
-    # FIXME: Get followings from env.d or somewhere else
     return '%s/lib/' % qtDIR()
 
 # Binutils Variables
diff --git a/pisi/package.py b/pisi/package.py
index 41ac7f53..18d1f8ff 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -72,19 +72,19 @@ class Package:
             # FIXME: exists is not enough, also sha1sum check needed
             #        when implemented in pisi-index.xml
             if not exists(self.filepath):
-                fetch_url(url, dest, ctx.ui.Progress)
-
                 if installed and exists(current_fn):
                     # if package is installed and old pisi file exists, fetch xdelta
                     if not exists(xdelta_fn):
-                        ctx.ui.debug(_("Package xdelta URI: %s") % xdelta_url)
+                        ctx.ui.info(_("Trying to fetch xdelta: %s") % xdelta_url)
                         try:
                             fetch_url(xdelta_url, dest, ctx.ui.Progress)
-                        except FetchError:
-                            pass
-                    # generate new one using old pisi file and xdelta
-                    # baris: but why do we generate this here?
-                    util.generate_pisi_file(xdelta_fn, current_fn, self.filepath)
+                        except FetchError,e:
+                            ctx.ui.error(_('XDelta %s: not exists') % xdelta_url)
+                        else:
+                            # generate new one using old pisi file and xdelta
+                            # baris: but why do we generate this here?
+                            util.generate_pisi_file(xdelta_fn, current_fn, self.filepath)
+                fetch_url(url, dest, ctx.ui.Progress)
             else:
                 ctx.ui.info(_('%s [cached]') % url.filename())