Issue #4 Throwing exception when needed