removed checking for NoneType attributes, no longer needed as per previous merge