Merge "Fixing Null Value Exception" into dublin