Quest works fine up to a point when you have to take the weapon on shore. In this part there is transition between underwater and land area. Upon moving from underwater to land weapon is lost and quest cannot be completed.
I have been able to work around it by dropping weapon in shallow water and picking it up from land.