diff --git a/zipline/utils/run_algo.py b/zipline/utils/run_algo.py
index d72c3c96..9408cc99 100644
--- a/zipline/utils/run_algo.py
+++ b/zipline/utils/run_algo.py
@@ -329,13 +329,13 @@ def run_algorithm(start,
         # if neither data nor bundle are passed use 'quantopian-quandl'
         bundle = 'quantopian-quandl'
 
-    if len(non_none_data) != 1:
+    elif len(non_none_data) != 1:
         raise ValueError(
             'must specify one of `data`, `data_portal`, or `bundle`,'
             ' got: %r' % non_none_data,
         )
 
-    if 'bundle' not in non_none_data and bundle_timestamp is not None:
+    elif 'bundle' not in non_none_data and bundle_timestamp is not None:
         raise ValueError(
             'cannot specify `bundle_timestamp` without passing `bundle`',
         )