[SAPI-16] Added upsert and put methods

Also made exception handling change to create