Comment unused console.log
Fix exception propagation