Hotfix.

NPE when requesting job statistics and there was no errors found.
conflicts fixed