address feature and further error handling