Revert e28171e..fc0b316

This rolls back to commit e28171ef028bb445612ae5596b2e3499fbd2b53a.
add error check