diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp
index 9a59250f..0fb551d6 100644
--- a/proprietary/wvm/WVMMediaSource.cpp
+++ b/proprietary/wvm/WVMMediaSource.cpp
@@ -222,7 +222,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
     int retryLimit = 500;  // Limit on number of retries before timeout, 10ms per retry
 
     ReadOptions::SeekMode mode;
-    if (options && options->getSeekTo(&seekTimeUs, &mode)) {
+    if (options != NULL && options->getSeekTo(&seekTimeUs, &mode)) {
 
         // When doing a seek, use a longer timeout since we need to set up a new connection
         retryLimit = 1500;
@@ -258,9 +258,10 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
         }
     }
 
-    MediaBuffer *mediaBuf;
+    MediaBuffer *mediaBuf = NULL;
 
-    status_t err = mGroup->acquire_buffer(&mediaBuf);
+    status_t err = mGroup->acquire_buffer(
+            &mediaBuf, options != NULL && options->getNonBlocking());
 
     if (err != OK) {
         CHECK(mediaBuf == NULL);