Make sure base_uri is correct (submitted by James Lewis)