diff --git a/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate b/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate
index 69b6270..7b9f37f 100644
Binary files a/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate and b/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/camera/CameraManager.swift b/camera/CameraManager.swift
index c57c8f5..ce169a7 100644
--- a/camera/CameraManager.swift
+++ b/camera/CameraManager.swift
@@ -206,7 +206,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         return addPreviewLayerToView(view, newCameraOutputMode: cameraOutputMode)
     }
     public func addPreviewLayerToView(view: UIView, newCameraOutputMode: CameraOutputMode) -> CameraState {
-        return addPreviewLayerToView(view, newCameraOutputMode: cameraOutputMode, completition: nil)
+        return addPreviewLayerToView(view, newCameraOutputMode: newCameraOutputMode, completition: nil)
     }
     public func addPreviewLayerToView(view: UIView, newCameraOutputMode: CameraOutputMode, completition: (Void -> Void)?) -> CameraState {
         if _canLoadCamera() {
@@ -476,7 +476,8 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         
         if shouldReinitializeMovieOutput {
             movieOutput = AVCaptureMovieFileOutput()
-            
+//            movieOutput?.movieFragmentInterval = kCMTimeInvalid            
+
             captureSession?.beginConfiguration()
             captureSession?.addOutput(movieOutput)
             captureSession?.commitConfiguration()
diff --git a/camera/ViewController.swift b/camera/ViewController.swift
index 13aaa0f..fc739b0 100644
--- a/camera/ViewController.swift
+++ b/camera/ViewController.swift
@@ -68,20 +68,12 @@ class ViewController: UIViewController {
     private func addCameraToView()
     {
         cameraManager.addPreviewLayerToView(cameraView, newCameraOutputMode: CameraOutputMode.VideoWithMic)
-        cameraManager.showErrorBlock = { (erTitle: String, erMessage: String) -> Void in
+        cameraManager.showErrorBlock = { [weak self] (erTitle: String, erMessage: String) -> Void in
+        
+            let alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .Alert)
+            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: { (alertAction) -> Void in  }))
             
-//            var alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .Alert)
-//            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: { (alertAction) -> Void in
-//                //
-//            }))
-//            
-//            let topController = UIApplication.sharedApplication().keyWindow?.rootViewController
-//            
-//            if (topController != nil) {
-//                topController?.presentViewController(alertController, animated: true, completion: { () -> Void in
-//                    //
-//                })
-//            }
+            self?.presentViewController(alertController, animated: true, completion: nil)
         }
     }