Removed some un-needed checks...

and fixed an issue with short-circuiting.