Fixing null object