Removed extraneous condition that was incorrectly causing a null to be returned.