Error checking (17/28)

Error checking