diff --git a/AudioFile.h b/AudioFile.h
index aa33f50..36bb41d 100644
--- a/AudioFile.h
+++ b/AudioFile.h
@@ -1245,6 +1245,9 @@ void AudioFile<T>::clearAudioBuffer()
 template <class T>
 AudioFileFormat AudioFile<T>::determineAudioFileFormat (const std::vector<uint8_t>& fileData)
 {
+    if (fileData.size() < 4)
+        return AudioFileFormat::Error;
+    
     std::string header (fileData.begin(), fileData.begin() + 4);
     
     if (header == "RIFF")
diff --git a/tests/GeneralTests.cpp b/tests/GeneralTests.cpp
index cc0ff39..705a5b5 100644
--- a/tests/GeneralTests.cpp
+++ b/tests/GeneralTests.cpp
@@ -107,4 +107,13 @@ TEST_SUITE ("General Tests")
             
         checkFilesAreExactlyTheSame<int16_t> (a, b);
     }
+    
+    //=============================================================
+    TEST_CASE ("GeneralTests::Empty Data")
+    {        
+        AudioFile<float> a;
+        a.shouldLogErrorsToConsole (false);
+        bool result = a.loadFromMemory (std::vector<uint8_t>());
+        CHECK_EQ (result, false);
+    }
 }