[PATCH] Raise more useful exceptions