Adding support for when actual is null
Added test and improved check
Merge branch 'upstream/master'

* upstream/master:
  Added test and improved check
  Adding support for when actual is null