remove the g_return_if_fail()s from the last patch so I don't end up breaking