Add dep on jsr305, use @Nullable