NPE fix, popup preview