Added an additional catch