Added some status checking.