Minor change:
- giving more explicit messages when an error occurs