auth fix + replaced error type
Merge branch 'dev.gening'