Changed tomb error code checks