Try/catch block on model save process
Merge remote branch 'origin/develop'