Fix for null stacktraces