Adding error message. Small adjustments.