Add nil handler
Fix line
Last fix