Replace some RuntimeException by NotSupportedException