Removed duplicate line
Fixed error message + lookup checking
The word "located"

Gee, I sure am committing too many changes too often.