Svace issues: Null check and memory leaks