# HG changeset patch
# User Merge Script
# Date 1455256957 -3600
# Node ID 0b45bfee359520ccf51343cf6519adfca7aad181
# Parent  1f9d967025d534806e3d4bdcf09f1bf947745893# Parent  335aa560bb05b678e194b15f335c7904c0c4ab68
Merge

diff -r 1f9d967025d5 -r 0b45bfee3595 AbstractLauncherApplication.st
--- a/AbstractLauncherApplication.st	Wed Feb 10 06:51:05 2016 +0100
+++ b/AbstractLauncherApplication.st	Fri Feb 12 07:02:37 2016 +0100
@@ -7482,10 +7482,14 @@
             ] on:PackageLoadError do:[:ex |
                 |path|
 
-                path := pathByItem at:someItem.
-                "/ try to load the file as is (i.e. not via package-id
-                (Dialog information:'package ID inconsistency - loading file directly...').
-                Smalltalk fileIn:(packageDirPath asFilename / path).
+                path := pathByItem at:someItem ifAbsent:nil.
+                path isNil ifTrue:[
+                    (Dialog information:'package ID inconsistency - cannot load...').
+                ] ifFalse:[    
+                    "/ try to load the file as is (i.e. not via package-id
+                    (Dialog information:'package ID inconsistency - loading file directly...').
+                    Smalltalk fileIn:(packageDirPath asFilename / path).
+                ].
             ]
         ] ensure:[
             Smalltalk retractInterestsFor:updateAction.
diff -r 1f9d967025d5 -r 0b45bfee3595 DirectoryContentsBrowser.st
--- a/DirectoryContentsBrowser.st	Wed Feb 10 06:51:05 2016 +0100
+++ b/DirectoryContentsBrowser.st	Fri Feb 12 07:02:37 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -2910,7 +2912,7 @@
     kbString := UnitConverter fileSizeStringFor:(kiloBytes * 1024).
     self notify:('%2 in %1' 
                     bindWith:(aDirectory baseName "pathName" allBold) 
-                    with:(kbString , 'b') "allBold").
+                    with:kbString "allBold").
 !
 
 startDiskUsageInfoProcess
@@ -2969,13 +2971,22 @@
             |kiloBytes|
 
             self notify:('collecting disk usage of %1...' bindWith:directory baseName).
-            kiloBytes := self diskUsageInKiloBytesFor:directory.
-            kiloBytes notNil ifTrue:[
-                diskUsageInfo notNil ifTrue:[
-                    diskUsageInfo at:dirPath put:(Timestamp now -> kiloBytes).
-                    self showDiskUsageInfoFor:directory as:kiloBytes.
+            OpenError 
+                handle:[:ex |
+                    self notify:('cannot open %1 (%2)' 
+                        bindWith:ex pathName asString 
+                        with:ex description).
+                ] 
+                do:[
+                    kiloBytes := self diskUsageInKiloBytesFor:directory.
+                    kiloBytes notNil ifTrue:[
+                        diskUsageInfo notNil ifTrue:[
+                            diskUsageInfo at:dirPath put:(Timestamp now -> kiloBytes).
+                            self showDiskUsageInfoFor:directory as:kiloBytes.
+                        ].
+                    ]
                 ].
-            ]
+
         ] fork.
 ! !