[vcs] simplify if-else statements to ?:
[vcs] log exceptions even if they should be ignored
[vcs] rearrange fields
[vcs] @Nullable/NotNull