Better error handling. Partial...