Added null check and more assets