[WIP] Replace some RuntimeException by NotSupportedException