Fix JSHint warnings, remove superfluous catch/reject inside Promise