Fixed bdd NullPointerException