Add Error handling for Parameters and Fields