Vish/Naz - Fixed crash on image capture