diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts index 39127651c3d..971e5a245ff 100644 --- a/public/app/features/annotations/annotations_srv.ts +++ b/public/app/features/annotations/annotations_srv.ts @@ -59,9 +59,14 @@ export class AnnotationsSrv { }; }) .catch(err => { + if (err.cancelled) { + return []; + } + if (!err.message && err.data && err.data.message) { err.message = err.data.message; } + console.error('AnnotationSrv.query error', err); appEvents.emit(AppEvents.alertError, ['Annotation Query Failed', err.message || err]); return [];