UC-2038 Removed security for OPTIONS requests. Fixed a NPE