improve error message to be more clear
remove wrong return