Fixing some invalid checks and cleaning some redundant conditions
am: b740f59c7d

* commit 'b740f59c7d572d54402e3a74fb2a23c0f1b1af48':
  Fixing some invalid checks and cleaning some redundant conditions