Catch IllegalArgumentExceptions thrown by guards

Also, the logic wasn't added to a guard, right? Maybe just remove the "in guard" in "Added logic in guard to..."