Fixed few coverity reported issues around concurrency, null checks