[ADD] Adding checks in the proxy