diff --git a/src/bin/bemail_utils/spamdbm.cpp b/src/bin/bemail_utils/spamdbm.cpp
index e70cd0abab..85b067f256 100644
--- a/src/bin/bemail_utils/spamdbm.cpp
+++ b/src/bin/bemail_utils/spamdbm.cpp
@@ -2612,7 +2612,7 @@ status_t ABSApp::AddPositionIOToDatabase (
     sprintf (ErrorMessage, "The database is full!  There are %lu messages in "
       "it and we can't add any more without overflowing the maximum integer "
       "representation in 32 bits", NewAge);
-    return ENOMEM;
+    return B_NO_MEMORY;
   }
 
   /* Check that this file hasn't already been added to the database. */
@@ -2724,7 +2724,7 @@ status_t ABSApp::AddPositionIOToDatabase (
         sprintf (ErrorMessage, "Failed to insert new database entry for "
           "word \"%s\", while processing file \"%s\"",
           WordIter->c_str (), OptionalFileName);
-        return ENOMEM;
+        return B_NO_MEMORY;
       }
       DataIter = InsertResult.first;
       m_WordCount++;
diff --git a/src/bin/urlwrapper.cpp b/src/bin/urlwrapper.cpp
index 63343b9967..75178f6afc 100644
--- a/src/bin/urlwrapper.cpp
+++ b/src/bin/urlwrapper.cpp
@@ -102,7 +102,7 @@ status_t Url::ParseAndSplit()
 
 	v = FindFirst(":");
 	if (v < 0)
-		return EINVAL;
+		return B_BAD_VALUE;
 	
 	// TODO: proto and host should be lowercased.
 	// see http://en.wikipedia.org/wiki/URL_normalization