Closing #257 (OutOfMemoryError on Gateway when unable to connect to Portal)