Error checking (27/28)

Error checking