Bugfix/call callback if needed

[pbodsk]

@nickskull Here's the fix I made....Nothing fancy, just a check to see if we should handle the error case or call the callback if it is present