Fixed bugs with null details