Resolved Issues: Issue #5, Issue #6, both caught by raised exceptions