Improve error handling
Improve error handling

WPO-Foundation/gnirehtet,WPO-Foundation/gnirehtet,Genymobile/gnirehtet,Genymobile/gnirehtet,Genymobile/gnirehtet,WPO-Foundation/gnirehtet,WPO-Foundation/gnirehtet