Merge "Revert "Fixing HTTP response code for not existing in database""