Add status check to ensure we gracefully discontinue (#158)

Add status check to ensure we gracefully discontinue (#158) #493