Address #92

/cc @mikesherov 
Consider switching this to a guard clause to reduce nesting level. Gets a bit hard to read.