I commited it, as the changes indeed made a lot of sense. I just replaced the qFatal by a warning (we don't use qFatal ever), and fixed the check that would lead to it.