SW-28 Escapes
SW-28 Add checking null
Merge pull request #46 from jsolve/SW-28

SW-28 Escapes