Small fixes for pull request to be accepted in master repo.
- Change tab characters into 4 spaces.
- Change if( to if (.
- Change for( to for (.
- Not Swallowing exception anymore. log.warn added.
- Remove unnecessary logging.