diff -r a152385bb39d -r 0b696286a1b2 brandingserver/bsserver/cbsinstallhandler.cpp --- a/brandingserver/bsserver/cbsinstallhandler.cpp Fri Mar 12 15:43:59 2010 +0200 +++ b/brandingserver/bsserver/cbsinstallhandler.cpp Mon Mar 15 12:41:57 2010 +0200 @@ -343,7 +343,7 @@ // aaa$bbb -> aaa$bbb.install CDir* dir = NULL; iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); - if( dir->Count() > 0 ) + if( dir && dir->Count() > 0 ) { // brand is installed delete dir; @@ -362,7 +362,7 @@ // check file with different versions: // aaa$bbb -> aaa$bbb$*.install iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); - if( dir->Count() > 0 ) + if( dir && dir->Count() > 0 ) { // brand is installed delete dir;