diff --git a/e107_handlers/library_manager.php b/e107_handlers/library_manager.php
index 79a4dd01c..7709f9a42 100644
--- a/e107_handlers/library_manager.php
+++ b/e107_handlers/library_manager.php
@@ -1499,7 +1499,7 @@ class e_library_manager
 		$adminTheme = e107::getPref('admintheme');
 
 		// Load integration_files.
-		if(!$library['post_load_integration_files'] && !empty($library['integration_files']))
+		if(!empty($library['post_load_integration_files']) && !$library['post_load_integration_files'] && !empty($library['integration_files']))
 		{
 			foreach($library['integration_files'] as $provider => $files)
 			{
@@ -1611,7 +1611,7 @@ class e_library_manager
 		}
 
 		// Load integration_files.
-		if($library['post_load_integration_files'] && !empty($library['integration_files']))
+		if(!empty($library['post_load_integration_files']) && $library['post_load_integration_files'] && !empty($library['integration_files']))
 		{
 			foreach($library['integration_files'] as $provider => $files)
 			{
@@ -1852,6 +1852,11 @@ class e_library_manager
 	 */
 	private function preLoad(&$library)
 	{
+		if(empty($library['machine_name']))
+		{
+			return;
+		}
+
 		if(defset('e_ADMIN_AREA', false) == true)
 		{
 			$coreLibrary = new core_library();