Fixed NPE

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>
Minor updates

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>