Popcorn fixes and initial work on error catching.