Added wikipedia null case MLAP-1837