Fixing some error messages and code automation.

Signed-off-by: edge226 <lucid@celps.org>