Refactored. Replaced '' by null.