Fix error handling...