Fix for NullPointerException.