Bug Fix: Avoid NPE.