added case for null exception
wer