Last version. Fixed null exception in one place