#7 fixed NPE when markup is null