Gpii 947

http://issues.gpii.net/browse/GPII-947
If found is always a boolean you can change this to just:  `if (found) {`