Fix for errors not bubbling up