tree 38234080d6549ca90dda93dc3908d4b2a89b2493
parent d38c5906f6eadbd20aee97ce37c665b3356dbfd1
author Timothy Bish <tabish121@gmail.com> 1461783029 -0400
committer Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com> 1461844612 +0000

Add some additional checks for valid state.
(cherry picked from commit 3c342ffce43546667f59bb16db373061724e1b0f)