diff --git a/src/de/superx/servlet/SxPool.java b/src/de/superx/servlet/SxPool.java
index 2447440..0d90902 100644
--- a/src/de/superx/servlet/SxPool.java
+++ b/src/de/superx/servlet/SxPool.java
@@ -1552,10 +1552,18 @@ public class SxPool extends GenericObjectPool implements NamedObjectI {
String importInstruction = work.substring(posstart + 10, posende );
ResultSet rs = stm.executeQuery(importInstruction);
+ boolean validReplaceText=false;
while (rs.next()) {
- StringUtils.replace(work, "" + importInstruction + "", rs.getString(1));
+ validReplaceText=true;
+ String replaceText=rs.getString(1);
+ if(replaceText==null)
+ StringUtils.replace(work, "" + importInstruction + "", "");
+ else
+ StringUtils.replace(work, "" + importInstruction + "", replaceText);
}
rs.close();
+ if(!validReplaceText)
+ break;
}
stm.close();
dbConnection.close();