more fine grained exception handling
extend injection handling for WPS4R