Added come additional checks and got a pull request for one of the checks for null computer check