Improve handling of nick-already-in-use errors