added check to see if curr is still valid.
added check to see if curr is still valid.

mikeal/watch,drjova/watch,mikeal/watch,cakecatz/watch,drjova/watch,WillJHaggard/watch,cakecatz/watch,WillJHaggard/watch