More docs, extended error types to keep more context