Corrected resources location
Added null handling to execute function