Fix Bug

Fix bug with NoneType in wikipedia (added more checking)