Comment out delete_from_postgis because it was part of a try/except block that was too general
Merge branch 'master' of github.com:GeoNode/geonode