@@ -3,6 +3,7 @@ CHANGES in VERSION 1.11.7

 * SingleAnnotation: if `col` is a vector with no names, it will be assigned

   as `level(value)` or `unique(value)`

 * HeatmapAnnotation: give warnings if color is defined while with no annotations

+* HeatmapAnnotation: check `col`, if it is not valid, give warnings

 ==========================

@@ -184,7 +184,7 @@ setMethod(f = "map_to_colors",

 		if(is.numeric(x)) x = as.character(x)

 		if(any(! x[!lna] %in% object@levels)) {

-			msg = paste0(object@name, ": cannot map some of the levels:\n", paste(setdiff(x[!lna], object@levels), sep = ", ", collapse = ", "))

+			msg = paste0(object@name, ": cannot map colors to some of the levels:\n", paste(setdiff(x[!lna], object@levels), sep = ", ", collapse = ", "))

 			stop(msg)

 		}

@@ -177,6 +177,20 @@ HeatmapAnnotation = function(df, name, col, na_col = "grey",

     }

     annotation_name_gp = recycle_gp(annotation_name_gp, n_total_anno)

+    if(!missing(col)) {

+    	if(is.null(names(col))) {

+    		stop("`col` should be a named list.")

+    	}

+    	if(any(is.na(names(col)))) {

+    		stop("`col` should be a named list.")

+    	}

+    	if(any(sapply(col, function(x) is.null(names(x))))) {

+    		stop("elements in `col` should be named vectors.")

+    	}

+    	if(any(sapply(col, function(x) any(is.na(names(x)))))) {

+    		stop("elements in `col` should be named vectors.")

+    	}

+    }

 	i_simple = 0

 	i_anno = 0

 	simple_length = NULL