Removed log.
Removed ambiguous error handling