Remove throw (handled in rev 78f6a5bcf158019aceb75a48aebd8d9c20b203ce)