Fix checks for invalid arguments (#497)

Fix checks for invalid arguments (#497) #1462