diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java
index 9de5cf61f48..61edb92730b 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java
@@ -120,30 +120,25 @@ public class CygwinPathResolver implements IBuildPathResolver {
 			IPath toSave = GnuUIPlugin.getDefault().getStateLocation();
 			toSave = toSave.addTrailingSeparator().append(OUTFILE);
 			String[] args = {ARG0, ARG1, toSave.toOSString(), REGISTRY_ROOTS[i]+REGISTRY_KEY+QUOT };
-			File f = new File(toSave.toOSString());
-			f.delete();
-			int result = -1;
 			try {
-				result = ProcessFactory.getFactory().exec(args).waitFor();
-			} 
-			catch (IOException e) {}
-			catch (InterruptedException e) {}
-			if (result == 0 && f.exists() && f.canRead()) {
-				BufferedReader r = null;
-				try {
-					r = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
-				} catch (FileNotFoundException e) {}
-				ArrayList ls = new ArrayList(1);
-				try {
+				File f = new File(toSave.toOSString());
+				f.delete();
+				if (ProcessFactory.getFactory().exec(args).waitFor() == 0 && f.exists() && f.canRead()) {
+					BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
+					ArrayList ls = new ArrayList(1);
 					String s;
 					while ((s = r.readLine() ) != null ) ls.add(s);
 					r.close();
 					f.delete();
-				} catch (IOException e) {}					
-				String[] aus = (String[])ls.toArray(new String[0]); 	
-				if (etcCygwin  == null) { etcCygwin  = getDir(aus, ETCPATTERN); }
-				if (binCygwin  == null) { binCygwin  = getDir(aus, BINPATTERN); }
-				if (rootCygwin == null) { rootCygwin = getDir(aus, ROOTPATTERN);}
+					String[] aus = (String[])ls.toArray(new String[0]); 	
+					if (etcCygwin  == null) { etcCygwin  = getDir(aus, ETCPATTERN); }
+					if (binCygwin  == null) { binCygwin  = getDir(aus, BINPATTERN); }
+					if (rootCygwin == null) { rootCygwin = getDir(aus, ROOTPATTERN);}
+				}
+			} catch (FileNotFoundException e) {
+			} catch (IOException e) {					
+			} catch (InterruptedException e) {
+			} catch (SecurityException e) {
 			}
 		}
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
index c3318795386..e4d53ad88d5 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
@@ -40,14 +40,11 @@ public class IsGnuCygwinToolChainSupported implements
 		String etcCygwin = CygwinPathResolver.getEtcPath();
 		if (etcCygwin != null) {
 			File file = new File(etcCygwin + "/setup/installed.db"); //$NON-NLS-1$
-			BufferedReader data;
-			try {
-				data = new BufferedReader(new FileReader(file));
-			} catch (FileNotFoundException e) { return false; }
-			
-			// all required package names should be found 
-			boolean[] found = new boolean[CHECKED_NAMES.length];
 			try {
+				BufferedReader data = new BufferedReader(new FileReader(file));
+
+				// all required package names should be found 
+				boolean[] found = new boolean[CHECKED_NAMES.length];
 				String s;			
 				while ((s = data.readLine()) != null ) {
 					for (int j = 0; j < CHECKED_NAMES.length; j++) {
@@ -59,8 +56,8 @@ public class IsGnuCygwinToolChainSupported implements
 					toolchainIsSupported &= found[j]; 
 				}
 				data.close();
+			} catch (FileNotFoundException e) {
 			} catch (IOException e) {
-				//TODO: log
 			}
 		}
 		return toolchainIsSupported;