Changed error handling to conform in blocks