Fixing null return