Somewhat better error handling