- improved wraning msg, removed useless test