Better link error handling