Exception handling fixed

404 error fixed