Added check for invalid file request

Also changes variable and method names to match Client