Review Empty And Null Cases

Review code for null, empty and zero-length inputs that were not considered.

• review
• code