diff --git a/common/create_lef_library.py b/common/create_lef_library.py
index 2d56b41..4b8ecf3 100755
--- a/common/create_lef_library.py
+++ b/common/create_lef_library.py
@@ -75,7 +75,7 @@
                                 else:
                                     headerseen = True
                         ltok = lline.split()
-                        if ltok[0] == 'END' and ltok[1] == 'LIBRARY':
+                        if len(ltok) > 1 and ltok[0] == 'END' and ltok[1] == 'LIBRARY':
                             # Remove "END LIBRARY" line from individual files
                             pass
                         else:
@@ -83,6 +83,10 @@
                     headerdone = True
                 print('#--------EOF---------\n', file=ofile)
 
+            # Add "END LIBRARY" to the end of the library file
+            print('', file=ofile)
+            print('END LIBRARY', file=ofile)
+
         if do_compile_only == True:
             print('Compile-only:  Removing individual LEF files')
             for lfile in llist: