Fixing NPE when severity is null - RA-344