Fixed exception unhandled  in phone
Refactored
Merge branch 'feature/throw_error' into develop