Some checks added. SC#34.