#188 Moved facility name validation up