1) added null check
modified project settings