diff --git a/src/Castle.Windsor/MicroKernel/Registration/ComponentRegistration.cs b/src/Castle.Windsor/MicroKernel/Registration/ComponentRegistration.cs
index 06c5821c7..0f4fe30d8 100644
--- a/src/Castle.Windsor/MicroKernel/Registration/ComponentRegistration.cs
+++ b/src/Castle.Windsor/MicroKernel/Registration/ComponentRegistration.cs
@@ -786,11 +786,11 @@ public ComponentRegistration<TService> NamedAutomatically(String name)
 		/// <param name = "actions"> A set of actions to be executed right after the component is created and before it's returned from the container. </param>
 		public ComponentRegistration<TService> OnCreate(params Action<TService>[] actions)
 		{
-			if (actions.IsNullOrEmpty())
+			if (actions != null && actions.Length != 0)
 			{
-				return this;
+				return OnCreate(actions.ConvertAll(a => new LifecycleActionDelegate<TService>((_, o) => a(o))));
 			}
-			return OnCreate(actions.ConvertAll(a => new LifecycleActionDelegate<TService>((_, o) => a(o))));
+			return this;
 		}
 
 		/// <summary>
@@ -813,16 +813,16 @@ public ComponentRegistration<TService> OnCreate(params LifecycleActionDelegate<T
 		/// <param name = "actions"> A set of actions to be executed right after the component is created and before it's returned from the container. </param>
 		public ComponentRegistration<TService> OnDestroy(params Action<TService>[] actions)
 		{
-			if (actions.IsNullOrEmpty())
+			if (actions != null && actions.Length != 0)
 			{
-				return this;
+				return OnDestroy(actions.ConvertAll(a => new LifecycleActionDelegate<TService>((_, o) => a(o))));
 			}
-			return OnDestroy(actions.ConvertAll(a => new LifecycleActionDelegate<TService>((_, o) => a(o))));
+			return this;
 		}
 
 		/// <summary>
 		/// Stores a set of <see cref = "LifecycleActionDelegate{T}" /> which will be invoked when the component is destroyed which means when it's released or it's lifetime scope ends. Notice that usage of this
-		/// method will cause instsances of the component to be tracked, even if they wouldn't be otherwise.
+		/// method will cause instances of the component to be tracked, even if they wouldn't be otherwise.
 		/// </summary>
 		/// <param name = "actions"> A set of actions to be executed when the component is destroyed. </param>
 		public ComponentRegistration<TService> OnDestroy(params LifecycleActionDelegate<TService>[] actions)