diff --git a/SpriteLibrary/SpriteEntryForm.Designer.cs b/SpriteLibrary/SpriteEntryForm.Designer.cs
index ba2819f..86975ac 100644
--- a/SpriteLibrary/SpriteEntryForm.Designer.cs
+++ b/SpriteLibrary/SpriteEntryForm.Designer.cs
@@ -174,6 +174,7 @@
             this.btnCancel.TabIndex = 9;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // btnApply
             // 
diff --git a/SpriteLibrary/SpriteInfo.cs b/SpriteLibrary/SpriteInfo.cs
index feceb6d..3407aac 100644
--- a/SpriteLibrary/SpriteInfo.cs
+++ b/SpriteLibrary/SpriteInfo.cs
@@ -68,6 +68,7 @@ namespace SpriteLibrary
         public Sprite CreateSprite(SpriteController ControllerToUse, SpriteDatabase TheDatabaseToUse)
         {
             Sprite DestSprite = null;
+            if (ControllerToUse == null) return null;
             for (int index = 0; index < Animations.Count; index++)
             {
                 AnimationInfo CurrentAnimation = Animations[index];