Corrected issue #1 whenm throwing exception instead of 404.