diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index 6579bb9033..89a60b34c9 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -700,6 +700,8 @@ Json::Value RPCHandler::doSubmit(const Json::Value& params)
 {
 	Json::Value		txJSON;
 	Json::Reader	reader;
+	
+	//std::string hello=params[1u].asString();
 
 	if (reader.parse(params[1u].asString(), txJSON))
 	{
@@ -741,6 +743,7 @@ Json::Value RPCHandler::handleJSONSubmit(const Json::Value& jvRequest)
 	}
 
 	AccountState::pointer asSrc	= mNetOps->getAccountState(uint256(0), srcAddress);
+	if(!asSrc) return rpcError(rpcSRC_ACT_MALFORMED);
 
 	if( txJSON["TransactionType"]=="Payment")
 	{
diff --git a/src/cpp/ripple/utils.h b/src/cpp/ripple/utils.h
index 8efdef4516..7667df578a 100644
--- a/src/cpp/ripple/utils.h
+++ b/src/cpp/ripple/utils.h
@@ -5,7 +5,6 @@
 #include <boost/format.hpp>
 
 #include <openssl/dh.h>
-
 #include "types.h"
 
 #define QUALITY_ONE			1000000000	// 10e9
@@ -41,6 +40,13 @@ extern uint32_t be32toh(uint32_t value);
 #define htole64(x) OSSwapHostToLittleInt64(x)
 #define be64toh(x) OSSwapBigToHostInt64(x)
 #define le64toh(x) OSSwapLittleToHostInt64(x)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#include <sys/endian.h>
+#elif defined(__OpenBSD__)
+#include <sys/types.h>
+#define be16toh(x) betoh16(x)
+#define be32toh(x) betoh32(x)
+#define be64toh(x) betoh64(x)
 #endif