Adding more robusts checks that everything runs okay.