diff --git a/source/org/jasig/portal/layout/dlm/PLFIntegrator.java b/source/org/jasig/portal/layout/dlm/PLFIntegrator.java
index <HASH>..<HASH> 100755
--- a/source/org/jasig/portal/layout/dlm/PLFIntegrator.java
+++ b/source/org/jasig/portal/layout/dlm/PLFIntegrator.java
@@ -38,6 +38,15 @@ public class PLFIntegrator
 
         DeleteManager.applyAndUpdateDeleteSet( plf, ilf, result );
         ParameterEditManager.applyAndUpdateParmEditSet(plf, ilf, result);
+
+        if( null == plfRoot )
+        {
+            throw new RuntimeException(
+                "The PLF layout root element is missing, so it appears " +
+                "that the database has been corrupted."
+                );
+        }
+        
         applyChildChanges( plfRoot, ilfRoot, result );
     }
 
@@ -47,15 +56,6 @@ public class PLFIntegrator
         throws PortalException
     {
         Element positions = null;
-
-        if( null == plfParent )
-        {
-            throw new java.lang.Error(
-                "The PLF parent element is missing, so it appears that the " +
-                "database has been corrupted."
-                );
-        }
-        
         Element node = (Element) plfParent.getFirstChild();
         
         while( node != null )
UP-<I>, replaced Error with RuntimeException, moved the code to the place where it will occur if at all, and modified the message to reflect the more specific cause.


git-svn-id: <URL>