diff --git a/src/core/MemoryManager.cpp b/src/core/MemoryManager.cpp
index 2f8cb675e..6a0c7060b 100644
--- a/src/core/MemoryManager.cpp
+++ b/src/core/MemoryManager.cpp
@@ -50,6 +50,11 @@ bool MemoryManager::init()
 
 void * MemoryManager::alloc( size_t size )
 {
+	if( !size )
+	{
+		return NULL;
+	}
+
 	int requiredChunks = size / MM_CHUNK_SIZE + ( size % MM_CHUNK_SIZE > 0 ? 1 : 0 );
 
 	MemoryPool * mp = NULL;
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
index 7a0b50b78..c0fc2d4d1 100644
--- a/src/core/SampleBuffer.cpp
+++ b/src/core/SampleBuffer.cpp
@@ -151,9 +151,7 @@ SampleBuffer::SampleBuffer( const f_cnt_t _frames ) :
 
 SampleBuffer::~SampleBuffer()
 {
-	if( m_origData != NULL )
-		MM_FREE( m_origData );
-
+	MM_FREE( m_origData );
 	MM_FREE( m_data );
 }