Feature/alternative error handling