Adding more error handling to test setup issues