Merge commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9' * commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9': Adding a missing catch
Merge commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9' * commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9': Adding a missing catch