diff --git a/lib/core/agent.py b/lib/core/agent.py
index 670420a6a..ce78736ee 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -824,6 +824,9 @@ class Agent(object):
         @rtype: C{str}
         """
 
+        if " FROM " not in query:
+            return query
+
         limitedQuery = query
         limitStr = queries[Backend.getIdentifiedDbms()].limit.query
         fromIndex = limitedQuery.index(" FROM ")