Catch nil current_request

My rebasing situation was too muddy to deal with #117 quickly ( with my level of git experience ), so here is a clean fork with a clean branch.