Error checking (7/28)

Error checking