Fix for spyware crash on project delete
Merge branch 'spywarefix' into DEV