Add resilience against zero-length, non-nil DISPLAY