Remove NullPointerException from With/Without Expression