Feature/error implementation