Bug correction (NullPointerException).