#186 - Fix slight bug where exceptions get thrown when they shouldn't