Improved error messages

Change-Id: I8a00e5b26a42a31b8aa48a8ba14f33734ab54276
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>