changed error message and remove wild card imports as per comments TRUNK-3293