X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2FClustalWS.java;h=a5fc7018bd3a62d5350ce24850fea7f0c864eb0f;hb=24b1f578d0752ca4e3ee410031af5678b3ff1189;hp=f13136a02bf2b632163c363190243c7b736e7732;hpb=2a269830633463e5016d5c92ed672d9e312c9776;p=jabaws.git

diff --git a/webservices/compbio/ws/server/ClustalWS.java b/webservices/compbio/ws/server/ClustalWS.java
index f13136a..a5fc701 100644
--- a/webservices/compbio/ws/server/ClustalWS.java
+++ b/webservices/compbio/ws/server/ClustalWS.java
@@ -155,10 +155,15 @@ public class ClustalWS implements MsaWS<ClustalW> {
 	@Override
 	public Limit<ClustalW> getLimit(String presetName) {
 		Timer timer = Timer.getMilliSecondsTimer();
+		if (limitMan == null) {
+			// No limit is configured
+			return null;
+		}
 		Limit<ClustalW> limit = limitMan.getLimitByName(presetName);
 		getLogger().logAll(timer, "getLimit");
 		return limit;
 	}
+
 	@Override
 	public LimitsManager<ClustalW> getLimits() {
 		return limitMan;