Fix for undefined handle name.