NIFI-185: Improved error message
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop