Handle a null pointer exception
Fix update site link