Use handlers in case of error instead of looking for error returns