Add some messages to the sender when an error occurs

This also removes the comments that were left here by the original
author but that are quite obvious...