Code

This patch provides better error messages to the client when something