adds error message
assigned to @chichi
enabled an automatic merge when all merge checks for ec519090 pass
merged
mentioned in commit 797076dc