added try catch
Merge branch 'Development'