Cleaned up error checking across edit view controllers