Fix logic error causing panic storing nil (#15)

Fix logic error causing panic storing nil (#15) #36