Fixes For Issue #16

Stop Panic When Key or Value are zero length.