Removed the Null error