vitaIiy
This should always be done before any photoshop work or code occurs. If a client wants a demo design first, you're certainly welcome to charge for it, and if a client doesn't like the fact that you're charging for a demo design, there are plenty more fish in the sea. It's not wrong to be selective of the clients you work with. You can also charge for tech support and for those extra calls/emails once you ship the product, all this goes into contract as well.
I know many studios who take 50% of agreed sum for the final product before they start any work. Cheapskate have no basis for making you do extra work if there is a clearly outlined set of deliverables in the contract. You can always dispute them in court if you feel that the terms of the contract have been violated.
By the time tsunami gets through all that trash, it's going to be a wave even surfers wouldn't like.