Fixed the numerous try-catches
Merge origin/master