fixed first NPE on production server