diff --git a/Pod/Classes/WPMediaPickerViewController.m b/Pod/Classes/WPMediaPickerViewController.m
index 3b5b079c..87c12fb7 100644
--- a/Pod/Classes/WPMediaPickerViewController.m
+++ b/Pod/Classes/WPMediaPickerViewController.m
@@ -599,11 +599,11 @@ - (UILabel *)defaultEmptyView
 
 - (void)addEmptyViewControllerToView
 {
-    if (self.emptyViewController.view.superview == nil) {
+    if (self.emptyViewController && self.emptyViewController.view.superview == nil) {
         [self.collectionView addSubview:self.emptyViewController.view];
-        _emptyViewController.view.frame = self.collectionView.frame;
-        [self addChildViewController:_emptyViewController];
-        [_emptyViewController didMoveToParentViewController:self];
+        self.emptyViewController.view.frame = self.collectionView.frame;
+        [self addChildViewController:self.emptyViewController];
+        [self.emptyViewController didMoveToParentViewController:self];
         [self centerEmptyView];
     }
 }
diff --git a/WPMediaPicker.podspec b/WPMediaPicker.podspec
index 3be11036..23de3af7 100644
--- a/WPMediaPicker.podspec
+++ b/WPMediaPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "1.2"
+  s.version          = "1.3"
   s.summary          = "WPMediaPicker is an iOS controller that allows capture and picking of media assets."
   s.description      = <<-DESC
                        WPMediaPicker is an iOS controller that allows capture and picking of media assets.