Move init failure check to beginning. Simplify slightly
version#++