From 977dee6b8ae7d8eec93fe0e895993aae12d99372 Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Thu, 4 Dec 2008 10:22:16 +0000
Subject: [PATCH] minimise exceptions for bad uniprot ids

---
 src/jalview/ws/dbsources/Uniprot.java |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index ab0b10c..f7773d8 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -116,8 +116,10 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
       Unmarshaller unmar = new Unmarshaller(uni);
       unmar.setIgnoreExtraElements(true);
       unmar.setMapping(map);
-
-      uni = (UniprotFile) unmar.unmarshal(new FileReader(file));
+      if (file!=null)
+      {
+        uni = (UniprotFile) unmar.unmarshal(new FileReader(file));
+      }
     } catch (Exception e)
     {
       System.out.println("Error getUniprotEntries() " + e);
-- 
1.7.10.2