Merge branch 'master' into lu_without_semantic_frames

unifier/views.py

@@ -1078,7 +1078,7 @@ def attach_lu_to_unified_frame(request):
         lu_sense = lu_base_sense_split[1]
 
         unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
-        lu = LexicalUnit.objects.get(base=lu_base, sense=lu_sense)
+        lu = LexicalUnit.objects.get(base=lu_base, sense=lu_sense, entry__isnull=False)
         frames = list(lu.frames.all())
         for frame in frames: