Issue #7 fixed: error message are more user-frendly