ahh, you are already checking for Empty here. Why not return Future None, below?