Fix NullPointerException pb and atg 1.0.4