* Added specific check for null area
* Null handling of previous commit was unnecessary