Handling errors (app level)
merge development into vs_134