A water safety plan for the city of Nagpur was developed by the National Environmental Engineering Research Institute (NEERI) and Nagpur Municipal Corporation (NMC). Possible hazards were identified through field visits. Based on this, an improvement plan was drawn up to suggest corrective actions and a time frame for implementation. The findings of this study are being used to modify or repair components of the water supply system and upgrade management procedures. This paper highlights the lessons learnt during implementation of the WSP and the key challenges faced.