Bug Fix: Avoid NullPointerException.