diff --git a/IPython/kernel/adapter.py b/IPython/kernel/adapter.py
index d7710c4..053df78 100644
--- a/IPython/kernel/adapter.py
+++ b/IPython/kernel/adapter.py
@@ -15,6 +15,8 @@ def code_to_line(code, cursor_pos):
     
     For adapting ``complete_`` and ``object_info_request``.
     """
+    if not code:
+        return "", 0
     for line in code.splitlines(True):
         n = len(line)
         if cursor_pos > n:
diff --git a/IPython/kernel/tests/test_adapter.py b/IPython/kernel/tests/test_adapter.py
index c59499c..af250b1 100644
--- a/IPython/kernel/tests/test_adapter.py
+++ b/IPython/kernel/tests/test_adapter.py
@@ -8,7 +8,7 @@ import json
 from unittest import TestCase
 import nose.tools as nt
 
-from IPython.kernel.adapter import adapt, V4toV5, V5toV4
+from IPython.kernel.adapter import adapt, V4toV5, V5toV4, code_to_line
 from IPython.kernel.zmq.session import Session
 
 
@@ -20,6 +20,10 @@ def test_default_version():
     adapted = adapt(original)
     nt.assert_equal(adapted['header']['version'], V4toV5.version)
 
+def test_code_to_line_no_code():
+    line, pos = code_to_line("", 0)
+    nt.assert_equal(line, "")
+    nt.assert_equal(pos, 0)
 
 class AdapterTest(TestCase):