Fix an error message and better usage