Slight tidy to avoid empty exception blocks