Issue #95 Throw exception instead returning NULL