[DO NOT MERGE, waiting for Smartdown bump] Input validation