Fixed bug where we cleaned up a location which had not yet been added