added check for non existent use