Ajay/Dileep | #000 | Moving migration marker outside try block and added additional gaurd condition