Correcting some logic around non-POST requests