Fixed nil and throw