Revert "Move checking of status to its own method."

This reverts commit b6bf4818830f4e521847ebfcd4190c0b19b66b41.