diff --git a/laravel/bundle.php b/laravel/bundle.php
index ea684ed5..fc7335e9 100644
--- a/laravel/bundle.php
+++ b/laravel/bundle.php
@@ -67,7 +67,10 @@ public static function register($bundle, $config = array())
 		// It is possible for the develoepr to specify auto-loader mappings
 		// directly on the bundle registration. This provides a convenient
 		// way to register mappings withuot a bootstrap.
-		static::autoloading($bundle, $config);
+		if (isset($config['autoloads']))
+		{
+			static::autoloading($bundle, $config);
+		}
 	}
 
 	/**
@@ -141,7 +144,7 @@ protected static function autoloading($bundle, $config)
 	{
 		$path = trim(Bundle::path($bundle), DS);
 
-		foreach (array_get($config, 'autoloads', array()) as $type => $mappings)
+		foreach ($config['autoloads'] as $type => $mappings)
 		{
 			// When registering each type of mapping we'll replace the (:bundle)
 			// place-holder with the path to the bundle's root directory, so