removed possible null errors