diff --git a/sites/all/modules/unl/unl_migration.php b/sites/all/modules/unl/unl_migration.php
index d90f5351cc8a6d8760e1173ba92c325548901f7a..48deb3b0541ea8cd4bc74e3c1f99da41bac24d60 100644
--- a/sites/all/modules/unl/unl_migration.php
+++ b/sites/all/modules/unl/unl_migration.php
@@ -361,6 +361,10 @@ class Unl_Migration_Tool
                     continue;
                 }
                 $childLinkNode = $childLinkLiNode->getElementsByTagName('a')->item(0);
+                // If somebody left this menu item empty, skip it.  Liferay, I'm looking at you!
+                if (!$childLinkNode || !$childLinkNode->hasAttribute('href')) {
+                    continue;
+                }
                 $childMenu[] = array('text' => trim($childLinkNode->textContent),
                                      'href' => $this->_makeLinkAbsolute($childLinkNode->getAttribute('href'), ''));
             }
@@ -547,7 +551,11 @@ class Unl_Migration_Tool
             if (!mb_check_encoding($path, 'UTF-8')) {
                 $path = iconv('ISO-8859-1', 'UTF-8', $path); 
             }
-            $file = file_save_data($data['content'], 'public://' . urldecode($path), FILE_EXISTS_REPLACE);
+            try {
+              $file = file_save_data($data['content'], 'public://' . urldecode($path), FILE_EXISTS_REPLACE);
+            } catch (Exception $e) {
+              $this->_log('Could not migrate file "' . $path . '"! File name too long?');
+            }
             $this->_hrefTransformFiles[$path] = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . $path;
             return;
         }