Removed null error