Fixed possible NullPointer if proxy is not yet created