--- embedtools/src/ub_env.c	2014/01/29 13:31:13	1.1.2.12
+++ embedtools/src/ub_env.c	2014/01/29 13:37:13	1.1.2.13
@@ -48,6 +48,7 @@ ub_flash_io(const char *csSec, int mode)
 	}
 
 	if (mode & O_RDWR) {
+		env->env_crc = crc32(0, (u_char*) env->env_data, esiz);
 		rlen = write(f, env, siz);
 		if (rlen != siz)
 			printf("Error:: written %d bytes != %d\n", rlen, siz);
@@ -64,8 +65,8 @@ ub_flash_io(const char *csSec, int mode)
 
 	crc = crc32(0, (u_char*) env->env_data, esiz);
 	if (crc != env->env_crc)
-		VERB(1) printf("Warning:: Flash crc32 0x%x != 0x%x - "
-				"Bad CRC, using default environment\n", env->env_crc, crc);
+		VERB(1) printf("Warning:: Bad CRC, Flash crc32 0x%x != 0x%x\n", 
+				env->env_crc, crc);
 
 	close(f);
 	close(l);
@@ -130,7 +131,7 @@ ub_getenv(const char *csSec, const char *csName)
 	if (!str) {
 		str = cfg_getAttribute(&cfg, csSec, "drive_size");
 		if (!str)
-			return -1;
+			return NULL;
 	}
 	dlen = strtol(str, NULL, 0);
 	if (!dlen)