Updates

Fixed the NullPointerException (caused by incorrectly defined response
templates)