Merge "Catch if an invalid constant is sent" into tm-dev