Potential fix for exception swallowing