#703: Remove workaround and throw
Add parenthisis
merge
Correct condition
Apply code review
Remove
Merge pull request #704 from andrerod/dev

#703: Remove workaround and throw