Modified some error outputs, and also removed an unnecessary if block.

Signed-off-by: Joe Dallago <jd.dallago@gmail.com>