Added proper catch for takePicture
Merge branch 'issue9'