improve unauthorized calls handling